Fix Cygwin and MinGW compilation

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

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index 8591612324134bd927df0dee747edaff21f72645..074cd75f9e957a4eb175f9caea118a646158fe85 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -56,7 +56,9 @@ bool wxDir::HasFiles(const wxString& spec)
 }
 
 // we have a (much) faster version for Unix
 }
 
 // we have a (much) faster version for Unix

-#if !defined(__UNIX_LIKE__) || defined(__WXMAC__)
+// MBN: Cygwin should use the Unix version, but with the current build sistem
+//      this is painful
+#if defined(__CYGWIN__) || !defined(__UNIX_LIKE__) || defined(__WXMAC__)

 
 bool wxDir::HasSubDirs(const wxString& spec)
 {
 
 bool wxDir::HasSubDirs(const wxString& spec)
 {

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index 64c75ed2843a42976d681a9ac07dc70127bcd92a..11fcf168e51ae81397c38bd06ea4843daddf32e2 100644 (file)
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -28,6 +28,8 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+#include <wx/icon.h>
+#include <wx/intl.h>

 #endif // WX_PRECOMP
 
 #include "wx/dir.h"
 #endif // WX_PRECOMP
 
 #include "wx/dir.h"


@@ -388,7 +390,7 @@ wxArrayString wxFSVolume::GetVolumes(int flagsSet, int flagsUnset)
     while (*pVol)
     {
         FilteredAdd(list, pVol, flagsSet, flagsUnset);
     while (*pVol)
     {
         FilteredAdd(list, pVol, flagsSet, flagsUnset);

-        pVol = pVol + _tcslen(pVol) + 1;
+        pVol = pVol + wxStrlen(pVol) + 1;

     }
 
     // Cleanup.
     }
 
     // Cleanup.