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

Compilation fixes for mingw-w64.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2008-05-31 12:44:40 +00:00
parent 91915e1c13
commit 3656eefc89
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/filefn.h
View File

@@ -202,7 +202,7 @@ enum wxFileKind
// 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__) #if defined(__BORLANDC__) || defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW64__)
#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
@@ -237,9 +237,16 @@ enum wxFileKind
#endif #endif
#ifdef wxHAS_HUGE_FILES #ifdef wxHAS_HUGE_FILES
#ifndef __MINGW64__
#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)
#else
// unfortunately, mingw-W64 is somewhat inconsistent...
#define wxSeek _lseeki64
#define wxLseek _lseeki64
#define wxTell _telli64
#endif
#else // !wxHAS_HUGE_FILES #else // !wxHAS_HUGE_FILES
#define wxSeek wxPOSIX_IDENT(lseek) #define wxSeek wxPOSIX_IDENT(lseek)
#define wxLseek wxPOSIX_IDENT(lseek) #define wxLseek wxPOSIX_IDENT(lseek)

2
include/wx/msw/wrapwin.h
View File

@@ -77,7 +77,7 @@
// pointer) on MSVC 7 and later. However, they are not available in older // pointer) on MSVC 7 and later. However, they are not available in older
// Platform SDKs, and since they are typedefs and not #defines we simply // Platform SDKs, and since they are typedefs and not #defines we simply
// overwrite them if there is a chance that they're not defined // overwrite them if there is a chance that they're not defined
#if !defined(_MSC_VER) || (_MSC_VER < 1300) #if (!defined(_MSC_VER) || (_MSC_VER < 1300)) && !defined(__WIN64__)
#define UINT_PTR unsigned int #define UINT_PTR unsigned int
#define INT_PTR int #define INT_PTR int
#define LONG_PTR long #define LONG_PTR long

2
include/wx/platform.h
View File

@@ -505,7 +505,7 @@
/* size_t is the same as unsigned int for all Windows compilers we know, */ /* size_t is the same as unsigned int for all Windows compilers we know, */
/* so define it if it hadn't been done by configure yet */ /* so define it if it hadn't been done by configure yet */
# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) # if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) && !defined(__WIN64__)
# define wxSIZE_T_IS_UINT # define wxSIZE_T_IS_UINT
# endif # endif
#endif /* OS */ #endif /* OS */