From f71bac73ce5dc31f539ba76ae080bede52bec026 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 24 Sep 2009 08:10:46 -0400
Subject: [PATCH] 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.
---
 SystemTools.cxx      | 7 +++++--
 kwsysDateStamp.cmake | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/SystemTools.cxx b/SystemTools.cxx
index 96cde13..fc433e3 100644
--- a/SystemTools.cxx
+++ b/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__
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 2c7f664..b067929 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2009)
 SET(KWSYS_DATE_STAMP_MONTH 09)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   23)
+SET(KWSYS_DATE_STAMP_DAY   24)
-- 
GitLab