From 4cfb1203e1ba920fa7605e4b5f323c31a3f669e8 Mon Sep 17 00:00:00 2001
From: Stefan Neis <Stefan.Neis@t-online.de>
Date: Sat, 31 May 2008 12:43:44 +0000
Subject: [PATCH] Compilation fixes for mingw-w64.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/filefn.h      | 15 +++++++++++----
 include/wx/msw/wrapwin.h |  2 +-
 include/wx/platform.h    |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index e826869296..19e682bc22 100644
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -197,7 +197,7 @@ enum wxFileKind
     // to avoid using them as they're not present in earlier versions and
     // always using the native functions spelling is easier than testing for
     // the versions
-    #if defined(__BORLANDC__) || defined(__DMC__) || defined(__WATCOMC__)
+    #if defined(__BORLANDC__) || defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW64__)
         #define wxPOSIX_IDENT(func)    ::func
     #else // by default assume MSVC-compatible names
         #define wxPOSIX_IDENT(func)    _ ## func
@@ -232,9 +232,16 @@ enum wxFileKind
     #endif
 
     #ifdef wxHAS_HUGE_FILES
-        #define   wxSeek       wxPOSIX_IDENT(lseeki64)
-        #define   wxLseek      wxPOSIX_IDENT(lseeki64)
-        #define   wxTell       wxPOSIX_IDENT(telli64)
+        #ifndef __MINGW64__
+            #define   wxSeek       wxPOSIX_IDENT(lseeki64)
+            #define   wxLseek      wxPOSIX_IDENT(lseeki64)
+            #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
         #define   wxSeek       wxPOSIX_IDENT(lseek)
         #define   wxLseek      wxPOSIX_IDENT(lseek)
diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index ef3f4505a6..5a6b424e43 100644
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -62,7 +62,7 @@
 // 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 
 // 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 LONG_PTR long
     #define ULONG_PTR unsigned long
diff --git a/include/wx/platform.h b/include/wx/platform.h
index 4dbeb8b5cd..4ffe37a3cd 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -496,7 +496,7 @@
 
     /* 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 */
-#    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
 #    endif
 #endif  /* OS */