Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Cygwin and MinGW compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-02-16 20:20:41 +00:00
parent f538710f0b
commit 67fade3398
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/dircmn.cpp
View File

@@ -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)
{ {

4
src/msw/volume.cpp
View File

@@ -28,6 +28,8 @@
#endif #endif
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include <wx/icon.h>
#include <wx/intl.h>
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/dir.h" #include "wx/dir.h"
@@ -388,7 +390,7 @@ wxArrayString wxFSVolume::GetVolumes(int flagsSet, int flagsUnset)
while (*pVol) while (*pVol)
{ {
FilteredAdd(list, pVol, flagsSet, flagsUnset); FilteredAdd(list, pVol, flagsSet, flagsUnset);
pVol = pVol + _tcslen(pVol) + 1; pVol = pVol + wxStrlen(pVol) + 1;
} }
// Cleanup. // Cleanup.