no changes, just the file I forgot to commit...

[wxWidgets.git] / src / msw / utils.cpp

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 6d23a0372829465f391c55ec515c5380c3ade980..34b1ee859ae625abbfb6a197eb91824b7e1e6556 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);


@@ -500,12 +500,12 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 
         if ( pTotal )
         {
 
         if ( pTotal )
         {

-            *pTotal = wxLongLong(bytesTotal.u.HighPart, bytesTotal.u.LowPart);
+            *pTotal = wxLongLong(bytesTotal.HighPart, bytesTotal.LowPart);

         }
 
         if ( pFree )
         {
         }
 
         if ( pFree )
         {

-            *pFree = wxLongLong(bytesFree.u.HighPart, bytesFree.u.LowPart);
+            *pFree = wxLongLong(bytesFree.HighPart, bytesFree.LowPart);

         }
     }
     else
         }
     }
     else