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

Test for __MINGW64_TOOLCHAIN__ and not __MINGW64__ in wx/filefn.h.

Browse Source 
MinGW-w64 headers are the same in 32 and 64 bit cases, so test for these
headers presence with __MINGW64_TOOLCHAIN__ and not for 64 bit build with
__MINGW64__, which should probably not be used anywhere at all.

This fixes problems with wx{Rm,Mk}dir() definitions with MinGW-w64 in
non-Unicode build.

Closes #16362.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-04 19:22:21 +00:00
parent 32f633a081
commit e0470c82a3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/filefn.h
View File

@@ -188,7 +188,7 @@ enum wxPosixPermissions
#elif (defined(__WINDOWS__) || defined(__OS2__)) && \ #elif (defined(__WINDOWS__) || defined(__OS2__)) && \
( \ ( \
defined(__VISUALC__) || \ defined(__VISUALC__) || \
defined(__MINGW64__) || \ defined(__MINGW64_TOOLCHAIN__) || \
(defined(__MINGW32__) && !defined(__WINE__) && \ (defined(__MINGW32__) && !defined(__WINE__) && \
wxCHECK_W32API_VERSION(0, 5)) || \ wxCHECK_W32API_VERSION(0, 5)) || \
defined(__DMC__) || \ defined(__DMC__) || \
@@ -203,8 +203,8 @@ enum wxPosixPermissions
// detect compilers which have support for huge files // detect compilers which have support for huge files
#if defined(__VISUALC__) #if defined(__VISUALC__)
#define wxHAS_HUGE_FILES 1 #define wxHAS_HUGE_FILES 1
#elif defined(__MINGW32__) || defined(__MINGW64__) #elif defined(__MINGW32__)
#define wxHAS_HUGE_FILES 1f #define wxHAS_HUGE_FILES 1
#elif defined(_LARGE_FILES) #elif defined(_LARGE_FILES)
#define wxHAS_HUGE_FILES 1 #define wxHAS_HUGE_FILES 1
#endif #endif
@@ -281,7 +281,7 @@ enum wxPosixPermissions
// to avoid using them as they're not present in earlier versions and // to avoid using them as they're not present in earlier versions and
// always using the native functions spelling is easier than testing for // always using the native functions spelling is easier than testing for
// the versions // the versions
#if defined(__BORLANDC__) || defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW64__) #if defined(__BORLANDC__) || defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW64_TOOLCHAIN__)
#define wxPOSIX_IDENT(func) ::func #define wxPOSIX_IDENT(func) ::func
#else // by default assume MSVC-compatible names #else // by default assume MSVC-compatible names
#define wxPOSIX_IDENT(func) _ ## func #define wxPOSIX_IDENT(func) _ ## func
@@ -296,7 +296,7 @@ enum wxPosixPermissions
#define wxWrite wxPOSIX_IDENT(write) #define wxWrite wxPOSIX_IDENT(write)
#ifdef wxHAS_HUGE_FILES #ifdef wxHAS_HUGE_FILES
#ifndef __MINGW64__ #ifndef __MINGW64_TOOLCHAIN__
#define wxSeek wxPOSIX_IDENT(lseeki64) #define wxSeek wxPOSIX_IDENT(lseeki64)
#define wxLseek wxPOSIX_IDENT(lseeki64) #define wxLseek wxPOSIX_IDENT(lseeki64)
#define wxTell wxPOSIX_IDENT(telli64) #define wxTell wxPOSIX_IDENT(telli64)
@@ -337,7 +337,7 @@ enum wxPosixPermissions
#ifdef wxHAS_HUGE_FILES #ifdef wxHAS_HUGE_FILES
// MinGW-64 provides underscore-less versions of all file functions // MinGW-64 provides underscore-less versions of all file functions
// except for this one. // except for this one.
#ifdef __MINGW64__ #ifdef __MINGW64_TOOLCHAIN__
#define wxCRT_StatA _stati64 #define wxCRT_StatA _stati64
#else #else
#define wxCRT_StatA wxPOSIX_IDENT(stati64) #define wxCRT_StatA wxPOSIX_IDENT(stati64)