diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-17 14:14:32 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-17 14:14:32 (GMT) |
| commit | e8ced6a0e203f6a6c73027eb9c70cc98c9d45f6c (patch) | |
| tree | 388d494bd750fb4bdc22b3bffe50a57736fec488 | |
| parent | 767f24aedae3bb7270e5001cd79bebf20d25cf78 (diff) | |
| download | CMake-e8ced6a0e203f6a6c73027eb9c70cc98c9d45f6c.zip CMake-e8ced6a0e203f6a6c73027eb9c70cc98c9d45f6c.tar.gz CMake-e8ced6a0e203f6a6c73027eb9c70cc98c9d45f6c.tar.bz2 | |
COMP: include windows.h first, as it is done in the other source files
Alex
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index e39fd71..aeffcdf 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -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() |