# HG changeset patch
# User koda
# Date 1370875041 -7200
# Node ID ba9cca49a5e2ced099bd0da7c444206bbbf123f3
# Parent  d87e2c7838fa1129ad9ad8fff62bd07ba5f22e0e
backout r1bed4aee19e0 and r3883b5dc600c

diff -r d87e2c7838fa -r ba9cca49a5e2 misc/libphysfs/CMakeLists.txt
--- a/misc/libphysfs/CMakeLists.txt	Tue Jun 11 02:42:52 2013 +0200
+++ b/misc/libphysfs/CMakeLists.txt	Mon Jun 10 16:37:21 2013 +0200
@@ -35,15 +35,6 @@
 include(CheckCSourceCompiles)
 
 
-# 32bit platforms won't link unless this is set
-# although Windows doesn't like it
-if(NOT WINDOWS)
-    if(CMAKE_SIZEOF_VOID_P LESS 8)
-        add_definitions(-DPHYSFS_NO_64BIT_SUPPORT=1)
-    endif(CMAKE_SIZEOF_VOID_P LESS 8)
-endif(NOT WINDOWS)
-
-
 if(MACOSX)
     # Fallback to older OS X on PowerPC to support wider range of systems...
     if(CMAKE_OSX_ARCHITECTURES MATCHES ppc)
diff -r d87e2c7838fa -r ba9cca49a5e2 misc/libphysfs/physfs_internal.h
--- a/misc/libphysfs/physfs_internal.h	Tue Jun 11 02:42:52 2013 +0200
+++ b/misc/libphysfs/physfs_internal.h	Mon Jun 10 16:37:21 2013 +0200
@@ -322,13 +322,8 @@
 #define __PHYSFS_ARRAYLEN(x) ( (sizeof (x)) / (sizeof (x[0])) )
 
 #ifdef PHYSFS_NO_64BIT_SUPPORT
-/* if a 32bit compiler sees something with this many bits: 0xFFFFFFFFFFFFFFFF
- *  it doesn't know if it really means 64bit or if it's supposed to squeeze
- *  it into 32 bit, so without the ULL it squeezes the number to 32 bit,
- *  with it it forces it to be 64bits
- */
-#define __PHYSFS_SI64(x) ((PHYSFS_sint64) (x##LL))
-#define __PHYSFS_UI64(x) ((PHYSFS_uint64) (x##ULL))
+#define __PHYSFS_SI64(x) ((PHYSFS_sint64) (x))
+#define __PHYSFS_UI64(x) ((PHYSFS_uint64) (x))
 #elif (defined __GNUC__)
 #define __PHYSFS_SI64(x) x##LL
 #define __PHYSFS_UI64(x) x##ULL