Some OS/2 updates

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

diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
index 5b130f01a01dd046e3099185dda92b051bdabe7d..c0e84b250b3b59f00cad8dc70812d75999ab1abf 100644 (file)
--- a/include/wx/msw/gccpriv.h
+++ b/include/wx/msw/gccpriv.h
@@ -3,6 +3,15 @@
 #ifndef _WX_MSW_GCCPRIV_H_
 #define _WX_MSW_GCCPRIV_H_
 
 #ifndef _WX_MSW_GCCPRIV_H_
 #define _WX_MSW_GCCPRIV_H_
 

+#if defined( __MINGW32__ ) && !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
+    #endif
+#endif
+

 // check for MinGW/Cygwin w32api version ( releases >= 0.5, only )
 #if defined( HAVE_W32API_H )
 #include <w32api.h>
 // check for MinGW/Cygwin w32api version ( releases >= 0.5, only )
 #if defined( HAVE_W32API_H )
 #include <w32api.h>


@@ -15,7 +24,7 @@
 
 // Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which
 // are more ms-like (header author is Anders Norlander, hence the name)
 
 // Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which
 // are more ms-like (header author is Anders Norlander, hence the name)

-#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
+#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95)))

     #ifndef wxUSE_NORLANDER_HEADERS
         #define wxUSE_NORLANDER_HEADERS 1
     #endif
     #ifndef wxUSE_NORLANDER_HEADERS
         #define wxUSE_NORLANDER_HEADERS 1
     #endif


@@ -32,5 +41,37 @@
     #define __GNUWIN32_OLD__
 #endif
 
     #define __GNUWIN32_OLD__
 #endif
 

+// Cygwin 1.0
+#if defined(__CYGWIN__) && ((__GNUC__==2) && (__GNUC_MINOR__==9))
+    #define __CYGWIN10__
+#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 )
+    #ifndef _tsetlocale
+      #if wxUSE_UNICODE
+      #define _tsetlocale _wsetlocale
+      #else
+      #define _tsetlocale setlocale
+      #endif
+    #endif
+    #ifndef _tgetenv
+      #if wxUSE_UNICODE
+      #define _tgetenv _wgetenv
+      #else
+      #define _tgetenv getenv
+      #endif
+    #endif
+    #ifndef _tfopen
+      #if wxUSE_UNICODE
+      #define _tfopen _wfopen
+      #else
+      #define _tfopen fopen
+      #endif
+    #endif
+#endif
+
+

 #endif
   // _WX_MSW_GCCPRIV_H_
 #endif
   // _WX_MSW_GCCPRIV_H_