don't test for __WIN95__ which doesn't exist any more; don't do compiler checks here...

[wxWidgets.git] / include / wx / msw / gccpriv.h

diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
index 52428c4624dd609d5cbe009911ecaca31cf95f9c..b449670d94348473181d3b7f83b70fe78390372e 100644 (file)
--- a/include/wx/msw/gccpriv.h
+++ b/include/wx/msw/gccpriv.h
@@ -18,12 +18,13 @@
     #define __GNUWIN32__
 #endif
 
+#if defined(__MINGW32__) && ( ( __GNUC__ > 2 ) || ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 95 ) ) )
+    #include <_mingw.h>
+#endif
+
 #if defined( __MINGW32__ ) && !defined(__WINE__) && !defined( HAVE_W32API_H )
-    #if ( __GNUC__ > 2 ) || ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 95 ) )
-        #include <_mingw.h>
-        #if __MINGW32_MAJOR_VERSION >= 1
-            #define HAVE_W32API_H
-        #endif
+    #if __MINGW32_MAJOR_VERSION >= 1
+        #define HAVE_W32API_H
     #endif
 #elif defined( __CYGWIN__ ) && !defined( HAVE_W32API_H )
     #if ( __GNUC__ > 2 )
@@ -31,7 +32,7 @@
     #endif
 #endif
 
-#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
+#if wxCHECK_WATCOM_VERSION(1,0)
     #define HAVE_W32API_H
 #endif