diff options
| author | Brad King <brad.king@kitware.com> | 2009-09-24 12:10:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-09-24 12:10:46 (GMT) |
| commit | f10929ae7ce3d62c7f49ffc9a98abf5d6b267b81 (patch) | |
| tree | c5853817b559c5494ba08a796f760d44753eb0ec /Source/kwsys/SystemTools.cxx | |
| parent | d6ffe2d5129df0a0e33874106fba0731482daa63 (diff) | |
| download | CMake-f10929ae7ce3d62c7f49ffc9a98abf5d6b267b81.zip CMake-f10929ae7ce3d62c7f49ffc9a98abf5d6b267b81.tar.gz CMake-f10929ae7ce3d62c7f49ffc9a98abf5d6b267b81.tar.bz2 | |
Restore KWSys SystemTools _WIN32 state on cygwin
The commit "Fix KWSys SystemTools build on cygwin with -mwin32" tried to
restore the state of the _WIN32 definition that was broken by the commit
"Optimize KWSys SystemTools::FileExists on Windows". It did so for the
case of building with -mwin32 on cygwin, but since including <windows.h>
defines _WIN32, it failed for the case of not using -mwin32.
This commit restores the state of _WIN32 in all cases by undefining it
after including <windows.h> if it was not defined beforehand.
Diffstat (limited to 'Source/kwsys/SystemTools.cxx')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index c0ec2e4..30865f9 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -64,9 +64,12 @@ #include <signal.h> /* sigprocmask */ #endif -// Windows API. Some parts used even on cygwin. -#if defined(_WIN32) || defined (__CYGWIN__) +// Windows API. +#if defined(_WIN32) +# include <windows.h> +#elif defined (__CYGWIN__) # include <windows.h> +# undef _WIN32 #endif #ifdef __CYGWIN__ |