Ifdefed out code that wouldn't compile with Mingw32 2.95.2

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index d34d0ede3e952404493523bd24f5a35fcef40995..453880612db140757b89f1301e823640b1d5f052 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -105,8 +105,6 @@ extern "C" {
 
 #include "wx/ioswrap.h"
 
 
 #include "wx/ioswrap.h"
 

-#include "wx/ioswrap.h"
-

 /* Need to undef new if including crtdbg.h */
 #  ifdef new
 #  undef new
 /* Need to undef new if including crtdbg.h */
 #  ifdef new
 #  undef new


@@ -456,7 +454,7 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
     if ( path.empty() )
         return FALSE;
 
     if ( path.empty() )
         return FALSE;
 

-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__GNUWIN32__)

     // GetDiskFreeSpaceEx() is not available under original Win95, check for
     // it
     typedef BOOL (*GetDiskFreeSpaceEx_t)(LPCTSTR,
     // GetDiskFreeSpaceEx() is not available under original Win95, check for
     // it
     typedef BOOL (*GetDiskFreeSpaceEx_t)(LPCTSTR,