[cmake-commits] alex committed cmGlobalGenerator.cxx 1.202 1.203
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Aug 17 10:14:34 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv27040
Modified Files:
cmGlobalGenerator.cxx
Log Message:
COMP: include windows.h first, as it is done in the other source files
Alex
Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- cmGlobalGenerator.cxx 16 Aug 2007 20:50:27 -0000 1.202
+++ cmGlobalGenerator.cxx 17 Aug 2007 14:14:32 -0000 1.203
@@ -14,6 +14,10 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include "windows.h" // this must be first to define GetCurrentDirectory
+#endif
+
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
#include "cmExternalMakefileProjectGenerator.h"
@@ -25,12 +29,6 @@
#include <stdlib.h> // required for atof
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#include <windows.h>
-// workaround against Windows name mangling:
-#undef GetCurrentDirectory
-#endif
-
#include <assert.h>
cmGlobalGenerator::cmGlobalGenerator()
More information about the Cmake-commits
mailing list