Fix MinGW compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index dff1b66eee148a1c6f486e772eaeb76a4f0b28b7..e590ff3fe87198927954d999222d0ea470bca6b5 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -270,13 +270,13 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 #define wxPATH_SEP_MAC        wxT(";")
 
 // platform independent versions
 #define wxPATH_SEP_MAC        wxT(";")
 
 // platform independent versions

-#if defined(__UNIX__) && !defined(__GNUWIN32__)
+#if defined(__UNIX__) && !defined(__CYGWIN__)

   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_UNIX
   #define wxPATH_SEP          wxPATH_SEP_UNIX
 #elif defined(__MAC__)
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_MAC
   #define wxPATH_SEP          wxPATH_SEP_MAC
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_UNIX
   #define wxPATH_SEP          wxPATH_SEP_UNIX
 #elif defined(__MAC__)
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_MAC
   #define wxPATH_SEP          wxPATH_SEP_MAC

-#elif defined(__GNUWIN32__) // Cygwin
+#elif defined(__CYGWIN__) // Cygwin

   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_DOS
   #define wxPATH_SEP          wxPATH_SEP_UNIX
 #else   // Windows and OS/2
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_DOS
   #define wxPATH_SEP          wxPATH_SEP_UNIX
 #else   // Windows and OS/2

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index cfc915390c33b623e5b02dcca81900c062cb9611..583c0711b330a6e8f5ace3aa7d4efa67f944a04f 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -119,7 +119,9 @@
     //
     // note that it must be included after <windows.h>
     #ifdef __GNUWIN32__
     //
     // note that it must be included after <windows.h>
     #ifdef __GNUWIN32__

-        #include <sys/cygwin.h>
+        #ifdef __CYGWIN__
+            #include <sys/cygwin.h>
+        #endif

         #include <wchar.h>
         #ifndef __TWIN32__
             #include <sys/unistd.h>
         #include <wchar.h>
         #ifndef __TWIN32__
             #include <sys/unistd.h>


@@ -1461,11 +1463,11 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
         }
 #endif // __DJGPP__
 
         }
 #endif // __DJGPP__
 

-#ifdef __GNUWIN32__
+#ifdef __CYGWIN__

         // another example of DOS/Unix mix (Cygwin)
         wxString pathUnix = buf;
         cygwin_conv_to_full_win32_path(pathUnix, buf);
         // another example of DOS/Unix mix (Cygwin)
         wxString pathUnix = buf;
         cygwin_conv_to_full_win32_path(pathUnix, buf);

-#endif // __GNUWIN32__
+#endif // __CYGWIN__

 
         // finally convert the result to Unicode if needed
 #if wxUSE_UNICODE && !defined(HAVE_WGETCWD)
 
         // finally convert the result to Unicode if needed
 #if wxUSE_UNICODE && !defined(HAVE_WGETCWD)

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 85d8b311f4377f2ba7d334eee345d868b8880d1c..b2788d0aae7f2f3edbfa82974bdbf9962df71ce6 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/utils.h"

     #include "wx/gdicmn.h"
 #endif
 
     #include "wx/gdicmn.h"
 #endif
 

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 6d23a0372829465f391c55ec515c5380c3ade980..00ea5c39eba8caf44a437927e2d852034bf93f60 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -61,7 +61,7 @@ extern "C" {
     #endif
 #endif  //GNUWIN32
 
     #endif
 #endif  //GNUWIN32
 

-#if defined(__GNUWIN32__) && !defined(__TWIN32__)
+#if defined(__CYGWIN__) && !defined(__TWIN32__)

     #include <sys/unistd.h>
     #include <sys/stat.h>
     #include <sys/cygwin.h> // for cygwin_conv_to_full_win32_path()
     #include <sys/unistd.h>
     #include <sys/stat.h>
     #include <sys/cygwin.h> // for cygwin_conv_to_full_win32_path()


@@ -374,7 +374,7 @@ const wxChar* wxGetHomeDir(wxString *pstr)
     if ( strDir.Last() != wxT('/') )
       strDir << wxT('/');
 
     if ( strDir.Last() != wxT('/') )
       strDir << wxT('/');
 

-    #ifdef __GNUWIN32__
+    #ifdef __CYGWIN__

       // Cygwin returns unix type path but that does not work well
       static wxChar windowsPath[MAX_PATH];
       cygwin_conv_to_full_win32_path(strDir, windowsPath);
       // Cygwin returns unix type path but that does not work well
       static wxChar windowsPath[MAX_PATH];
       cygwin_conv_to_full_win32_path(strDir, windowsPath);