Warning fixes for Cygwin

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 3014c6937753739393965f19d87fb0cecdfaf69e..f2e52808f6bf441b8be5b9be0f546cd10404a0b6 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -59,7 +59,7 @@
 #endif
 
 #if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined(__WXWINCE__)
+#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined(__WXWINCE__) && !defined(__CYGWIN__)
     #include <direct.h>
     #include <dos.h>
     #include <io.h>

diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
index e90318cf087044bb9b2963a357cd4b28a2e41e8a..bb557b4cc02459e424cc3304a5ae25d1915f37d7 100644 (file)
--- a/include/wx/msw/gccpriv.h
+++ b/include/wx/msw/gccpriv.h
@@ -18,7 +18,7 @@
     #define __GNUWIN32__
 #endif
 
-#if ( __GNUC__ > 2 ) || ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 95 ) )
+#if defined(__MINGW32__) && ( ( __GNUC__ > 2 ) || ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 95 ) ) )
     #include <_mingw.h>
 #endif