Mingw32 fix for 64-bit literals. stable-1.0
authorRyan C. Gordon <icculus@icculus.org>
Mon, 01 Oct 2007 15:47:40 +0000
branchstable-1.0
changeset 907 387bd51da4b1
parent 904 3c0531ffd64b
child 909 75b1c65b30c5
Mingw32 fix for 64-bit literals.
CHANGELOG
platform/win32.c
--- a/CHANGELOG	Thu Jul 12 10:37:56 2007 +0000
+++ b/CHANGELOG	Mon Oct 01 15:47:40 2007 +0000
@@ -4,6 +4,7 @@
 
 -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---
 
+10012007 - More mingw32 fixes.
 07122007 - Maybe fixed compile on mingw32.
 07112007 - Fixed crash on zero-byte read/write (thanks, Ensiform!).
 05052007 - Fixed zip archiver: could do bogus seek if a small, non-zip file
--- a/platform/win32.c	Thu Jul 12 10:37:56 2007 +0000
+++ b/platform/win32.c	Mon Oct 01 15:47:40 2007 +0000
@@ -29,10 +29,8 @@
     #define alloca(x) __builtin_alloca(x) 
 #endif
 
-#define LOWORDER_UINT64(pos) (PHYSFS_uint32) \
-    (pos & 0x00000000FFFFFFFF)
-#define HIGHORDER_UINT64(pos) (PHYSFS_uint32) \
-    (((pos & 0xFFFFFFFF00000000) >> 32) & 0x00000000FFFFFFFF)
+#define LOWORDER_UINT64(pos) ((PHYSFS_uint32) (pos & 0xFFFFFFFF))
+#define HIGHORDER_UINT64(pos) ((PHYSFS_uint32) ((pos >> 32) & 0xFFFFFFFF))
 
 /* GetUserProfileDirectory() is only available on >= NT4 (no 9x/ME systems!) */
 typedef BOOL (STDMETHODCALLTYPE FAR * LPFNGETUSERPROFILEDIR) (