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

test that _INTEGRAL_MAX_BITS is defined before comparing with it; changed wxHAS_HUGE_FILES to be either defined or undef'd for consistency with the other wxHAS_XXXs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-24 12:08:05 +00:00
parent 4ee9daf45c
commit 1ad688c96f
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/wx/filefn.h
View File

@@ -169,23 +169,29 @@ enum wxFileKind
#undef wxHAS_HUGE_FILES #undef wxHAS_HUGE_FILES
// detect compilers which have support for huge files (notice that the // detect compilers which have support for huge files (notice that the
// first case covers MSVC, so we don't have to test for it explicitly) // MSVC falls under _INTEGRAL_MAX_BITS >= 64 branch, so we don't have to
#if ((_INTEGRAL_MAX_BITS >= 64) || defined(_LARGE_FILES)) // test for it explicitly)
#if defined(_INTEGRAL_MAX_BITS)
#if _INTEGRAL_MAX_BITS >= 64
#define wxHAS_HUGE_FILES 1 #define wxHAS_HUGE_FILES 1
#endif
#elif defined(__MINGW32__) #elif defined(__MINGW32__)
#define wxHAS_HUGE_FILES 1 #define wxHAS_HUGE_FILES 1
#else #elif defined(_LARGE_FILES)
// DMC, Watcom, Metrowerks and Borland don't have huge file support (or #define wxHAS_HUGE_FILES 1
// at least not all functions needed for it by wx) currently
#define wxHAS_HUGE_FILES 0
#endif #endif
// other Windows compilers (DMC, Watcom, Metrowerks and Borland) don't have
// huge file support (or at least not all functions needed for it by wx)
// currently
// functions // functions
#if defined(__BORLANDC__) || defined(__WATCOMC__) #if defined(__BORLANDC__) || defined(__WATCOMC__)
#define _tell tell #define _tell tell
#endif #endif
#if wxHAS_HUGE_FILES #ifdef wxHAS_HUGE_FILES
typedef wxLongLong_t wxFileOffset; typedef wxLongLong_t wxFileOffset;
#define wxFileOffsetFmtSpec wxLongLongFmtSpec #define wxFileOffsetFmtSpec wxLongLongFmtSpec
#else #else
@@ -213,7 +219,7 @@ enum wxFileKind
#define wxWrite _write #define wxWrite _write
#endif #endif
#endif #endif
#if wxHAS_HUGE_FILES #ifdef wxHAS_HUGE_FILES
#define wxSeek _lseeki64 #define wxSeek _lseeki64
#define wxLseek _lseeki64 #define wxLseek _lseeki64
#define wxTell _telli64 #define wxTell _telli64
@@ -238,7 +244,7 @@ enum wxFileKind
#define wxAccess wxMSLU__waccess #define wxAccess wxMSLU__waccess
#define wxMkDir wxMSLU__wmkdir #define wxMkDir wxMSLU__wmkdir
#define wxRmDir wxMSLU__wrmdir #define wxRmDir wxMSLU__wrmdir
#if wxHAS_HUGE_FILES #ifdef wxHAS_HUGE_FILES
#define wxStat wxMSLU__wstati64 #define wxStat wxMSLU__wstati64
#else #else
#define wxStat wxMSLU__wstat #define wxStat wxMSLU__wstat
@@ -248,7 +254,7 @@ enum wxFileKind
#define wxAccess _waccess #define wxAccess _waccess
#define wxMkDir _wmkdir #define wxMkDir _wmkdir
#define wxRmDir _wrmdir #define wxRmDir _wrmdir
#if wxHAS_HUGE_FILES #ifdef wxHAS_HUGE_FILES
#define wxStat _wstati64 #define wxStat _wstati64
#else #else
#define wxStat _wstat #define wxStat _wstat
@@ -267,7 +273,7 @@ enum wxFileKind
#else #else
#define wxRmDir _rmdir #define wxRmDir _rmdir
#endif #endif
#if wxHAS_HUGE_FILES #ifdef wxHAS_HUGE_FILES
#define wxStat _stati64 #define wxStat _stati64
#else #else
#define wxStat _stat #define wxStat _stat
@@ -277,7 +283,7 @@ enum wxFileKind
// Types: Notice that Watcom is the only compiler to have a wide char // Types: Notice that Watcom is the only compiler to have a wide char
// version of struct stat as well as a wide char stat function variant. // version of struct stat as well as a wide char stat function variant.
// This was droped since OW 1.4 "for consistency across platforms". // This was droped since OW 1.4 "for consistency across platforms".
#if wxHAS_HUGE_FILES #ifdef wxHAS_HUGE_FILES
#if wxUSE_UNICODE && wxONLY_WATCOM_EARLIER_THAN(1,4) #if wxUSE_UNICODE && wxONLY_WATCOM_EARLIER_THAN(1,4)
#define wxStructStat struct _wstati64 #define wxStructStat struct _wstati64
#else #else
@@ -309,7 +315,7 @@ enum wxFileKind
#endif #endif
#endif #endif
#if wxHAS_HUGE_FILES #ifdef wxHAS_HUGE_FILES
// wxFile is present and supports large files. Currently wxFFile // wxFile is present and supports large files. Currently wxFFile
// doesn't have large file support with any Windows compiler (even // doesn't have large file support with any Windows compiler (even
// Win64 ones). // Win64 ones).