X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01ac0f138bbd3d9e51b83a26ef192e50219a2c0f..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/msw/gccpriv.h?ds=sidebyside

diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
index c08747990d..31453015b2 100644
--- a/include/wx/msw/gccpriv.h
+++ b/include/wx/msw/gccpriv.h
@@ -1,5 +1,14 @@
+/*
+ Name:        wx/msw/gccpriv.h
+ Purpose:     MinGW/Cygwin definitions
+ Author:      Vadim Zeitlin
+ Modified by:
+ Created:
+ Copyright:   (c) Vadim Zeitlin
+ Licence:     wxWindows Licence
+*/
+
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
-/* MinGW w32api specific stuff */
 
 #ifndef _WX_MSW_GCCPRIV_H_
 #define _WX_MSW_GCCPRIV_H_
@@ -8,20 +17,21 @@
     #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 ) 
+    #if ( __GNUC__ > 2 )
         #define HAVE_W32API_H
     #endif
 #endif
 
-#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200) 
+#if wxCHECK_WATCOM_VERSION(1,0)
     #define HAVE_W32API_H
 #endif
 
@@ -63,15 +73,6 @@
     #define __CYGWIN10__
 #endif
 
-/* Check for Mingw runtime version: */
-#if defined(__MINGW32_MAJOR_VERSION) && defined(__MINGW32_MINOR_VERSION)
-    #define wxCHECK_MINGW32_VERSION( major, minor ) \
- ( ( ( __MINGW32_MAJOR_VERSION > (major) ) \
-      || ( __MINGW32_MAJOR_VERSION == (major) && __MINGW32_MINOR_VERSION >= (minor) ) ) )
-#else
-    #define wxCHECK_MINGW32_VERSION( major, minor ) (0)
-#endif
-
 /* Mingw runtime 1.0-20010604 has some missing _tXXXX functions,
    so let's define them ourselves: */
 #if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) \
@@ -99,9 +100,10 @@
     #endif
 #endif
 
-// current (= before mingw-runtime 3.3) mingw32 headers forget to
-// define _puttchar, this will probably be fixed in the next versions but
-// for now do it ourselves
+/* current (= before mingw-runtime 3.3) mingw32 headers forget to
+   define _puttchar, this will probably be fixed in the next versions but
+   for now do it ourselves
+ */
 #if defined( __MINGW32__ ) && \
         !wxCHECK_MINGW32_VERSION(3,3) && !defined( _puttchar )
     #ifdef wxUSE_UNICODE