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

Don't use _{get,ch}drive() functions in Cygwin builds.

Browse Source 
They are not available there when not using MinGW headers, e.g. in 64 bit
builds.

Also simplify the code by using wxHAS_DRIVE_FUNCTIONS instead of complicated
(and sometimes negated) checks for MinGW32 version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-12 13:14:30 +00:00
parent 933c86960d
commit 8c26773f2f
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/generic/dirctrlg.cpp
View File

@@ -59,15 +59,13 @@
#include "wx/msw/winundef.h" #include "wx/msw/winundef.h"
#include "wx/volume.h" #include "wx/volume.h"
// FIXME - Mingw32 1.0 has both _getdrive() and _chdrive(). For now, let's assume // MinGW has _getdrive() and _chdrive(), Cygwin doesn't.
// older releases don't, but it should be verified and the checks modified #if defined(__GNUWIN32__) && !defined(__CYGWIN__)
// accordingly. #define wxHAS_DRIVE_FUNCTIONS
#if !defined(__GNUWIN32__) || (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
#if !defined(__WXWINCE__)
#include <direct.h>
#endif #endif
#include <stdlib.h>
#include <ctype.h> #ifdef wxHAS_DRIVE_FUNCTIONS
#include <direct.h>
#endif #endif
#endif // __WINDOWS__ #endif // __WINDOWS__
@@ -300,8 +298,7 @@ int setdrive(int WXUNUSED_IN_WINCE(drive))
{ {
#ifdef __WXWINCE__ #ifdef __WXWINCE__
return 0; return 0;
#elif defined(__GNUWIN32__) && \ #elif defined(wxHAS_DRIVE_FUNCTIONS)
(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
return _chdrive(drive); return _chdrive(drive);
#else #else
wxChar newdrive[4]; wxChar newdrive[4];
@@ -343,7 +340,7 @@ bool wxIsDriveAvailable(const wxString& WXUNUSED_IN_WINCE(dirName))
if (dirName.length() == 3 && dirName[(size_t)1] == wxT(':')) if (dirName.length() == 3 && dirName[(size_t)1] == wxT(':'))
{ {
wxString dirNameLower(dirName.Lower()); wxString dirNameLower(dirName.Lower());
#if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) #ifndef wxHAS_DRIVE_FUNCTIONS
success = wxDirExists(dirNameLower); success = wxDirExists(dirNameLower);
#else #else
#if defined(__OS2__) #if defined(__OS2__)