Author: cazfi
Date: Thu Jun 23 22:50:13 2016
New Revision: 32986

URL: http://svn.gna.org/viewcvs/freeciv?rev=32986&view=rev
Log:
Corrected ruledit.cpp include of windows.h to be guarded
by FREECIV_MSWINDOWS.

See bug #24782

Modified:
    trunk/client/connectdlg_common.c
    trunk/tools/ruledit/ruledit.cpp

Modified: trunk/client/connectdlg_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/connectdlg_common.c?rev=32986&r1=32985&r2=32986&view=diff
==============================================================================
--- trunk/client/connectdlg_common.c    (original)
+++ trunk/client/connectdlg_common.c    Thu Jun 23 22:50:13 2016
@@ -201,7 +201,7 @@
   char *storage;
 
 #if !defined(HAVE_USABLE_FORK)
-  /* Above also implies that this is FREECIV_MS_WINDOWS ->
+  /* Above also implies that this is FREECIV_MSWINDOWS ->
    * Win32 that can't use fork() */
   STARTUPINFO si;
   PROCESS_INFORMATION pi;

Modified: trunk/tools/ruledit/ruledit.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/ruledit.cpp?rev=32986&r1=32985&r2=32986&view=diff
==============================================================================
--- trunk/tools/ruledit/ruledit.cpp     (original)
+++ trunk/tools/ruledit/ruledit.cpp     Thu Jun 23 22:50:13 2016
@@ -20,7 +20,7 @@
 /* ANSI */
 #include <stdlib.h>
 
-#ifdef FREECIV_MS_WINDOWS
+#ifdef FREECIV_MSWINDOWS
 #include <windows.h>
 #endif
 
@@ -59,7 +59,7 @@
   int ui_options;
 
   /* Load win32 post-crash debugger */
-#ifdef WIN32_NATIVE
+#ifdef FREECIV_MSWINDOWS
 # ifndef FREECIV_NDEBUG
   if (LoadLibrary("exchndl.dll") == NULL) {
 #  ifdef FREECIV_DEBUG
@@ -67,7 +67,7 @@
 #  endif /* FREECIV_DEBUG */
   }
 # endif /* FREECIV_NDEBUG */
-#endif /* WIN32_NATIVE */
+#endif /* FREECIV_MSWINDOWS */
 
   init_nls();
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to