]> git.saurik.com Git - wxWidgets.git/commitdiff
fix wxLongLongFmtSpec for mingw32, Borland and Watcom (patch 1184864)
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 22 May 2005 18:19:03 +0000 (18:19 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 22 May 2005 18:19:03 +0000 (18:19 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/defs.h

index f5aedcae5b3725daa0c574d9ff2bbc698a1ff2bf..837900f660f37f80133e3cc8680d1e32e8aa40cc 100644 (file)
@@ -883,17 +883,20 @@ inline void *wxUIntToPtr(wxUIntPtr p)
 #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64
-    #define wxLongLongFmtSpec _T("Ld")
+    #define wxLongLongFmtSpec _T("L")
 #elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__)))
       #define wxLongLong_t __int64
       #define wxLongLongSuffix i64
-      #define wxLongLongFmtSpec _T("Ld")
+      #define wxLongLongFmtSpec _T("L")
 #elif defined(__DIGITALMARS__)
       #define wxLongLong_t __int64
       #define wxLongLongSuffix LL
       #define wxLongLongFmtSpec _T("ll")
+#elif defined(__MINGW32__)
+    #define wxLongLong_t long long
+    #define wxLongLongSuffix ll
+    #define wxLongLongFmtSpec _T("I64")
 #elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8)  || \
-        defined(__MINGW32__) || \
         defined(__GNUC__) || \
         defined(__CYGWIN__) || \
         defined(__WXMICROWIN__) || \