David Luff:

The one-liner removes a lot of re-definition warnings on Cygwin.

diff --git a/simgear/screen/extensions.hxx b/simgear/screen/extensions.hxx
index f97e0ad7b976bce23258aa340dfe7d6685fbaecb..30f63e214ac2a112ba33d574113e20fe624626b3 100644 (file)
--- a/simgear/screen/extensions.hxx
+++ b/simgear/screen/extensions.hxx
@@ -24,7 +24,7 @@
 #ifndef __SG_EXTENSIONS_HXX
 #define __SG_EXTENSIONS_HXX 1
 
-#if defined(__CYGWIN__)  /* && !defined(USING_X) */
+#if defined(__CYGWIN__) && !defined(WIN32) /* && !defined(USING_X) */
 #define WIN32
 #endif