Merge branch 'jmt/magvar' into next

[simgear.git] / simgear / screen / extensions.hxx

diff --git a/simgear/screen/extensions.hxx b/simgear/screen/extensions.hxx
index a0c09fd42e4813cc10a504808bf63ce0fff55ab4..d7999bc62cc0d1d0627dd47e8811b467e2405071 100644 (file)
--- a/simgear/screen/extensions.hxx
+++ b/simgear/screen/extensions.hxx
@@ -24,11 +24,7 @@
 #ifndef __SG_EXTENSIONS_HXX
 #define __SG_EXTENSIONS_HXX 1
 
-#if defined(__CYGWIN__) && !defined(WIN32) /* && !defined(USING_X) */
-#define WIN32
-#endif
-
-#if defined(WIN32)  /* MINGW and MSC predefine WIN32 */
+#ifdef WIN32
 # include <windows.h>
 #endif
 
@@ -36,9 +32,7 @@
 
 #include <osg/GL>
 
-#if defined (WIN32)
-#  include <GL/wgl.h>
-#elif !defined(__APPLE__)
+#if !defined(__APPLE__) && !defined(WIN32)
 #  include <GL/glx.h>
 #endif