From b2f9b617152c8f1c1a0d7333cb84f3199724aac2 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 21 Mar 2007 20:14:46 +0000 Subject: [PATCH] Replaced LONGLONGLITERAL with __PHYSFS_UI64/__PHYSFS_SI64. --- CHANGELOG.txt | 2 +- physfs_internal.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d50eb87a..675e6466 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,7 +1,7 @@ /* * CHANGELOG. */ - +03212007 - Replaced LONGLONGLITERAL with __PHYSFS_UI64/__PHYSFS_SI64 ... 03202007 - Removed platform/skeleton.c (it was out of date), added platform/macosx.c (To further Macify the code and get the #ifdefs out of unix.c), and refactored the platform layer to try and diff --git a/physfs_internal.h b/physfs_internal.h index ce764583..9c40a9d9 100644 --- a/physfs_internal.h +++ b/physfs_internal.h @@ -1274,9 +1274,11 @@ void __PHYSFS_sort(void *entries, PHYSFS_uint32 max, #define __PHYSFS_ARRAYLEN(x) ( (sizeof (x)) / (sizeof (x[0])) ) #ifdef __GNUC__ -#define LONGLONGLITERAL(x) x##LL +#define __PHYSFS_SI64(x) x##LL +#define __PHYSFS_UI64(x) x##ULL #else -#define LONGLONGLITERAL(x) x +#define __PHYSFS_SI64(x) x +#define __PHYSFS_UI64(x) x #endif /* @@ -1288,7 +1290,7 @@ void __PHYSFS_sort(void *entries, PHYSFS_uint32 max, */ #define __PHYSFS_ui64FitsAddressSpace(s) ( \ (sizeof (PHYSFS_uint64) > sizeof (size_t)) && \ - ((s) > (LONGLONGLITERAL(0xFFFFFFFFFFFFFFFF) >> (64-(sizeof(size_t)*8)))) \ + ((s) > (__PHYSFS_UI64(0xFFFFFFFFFFFFFFFF) >> (64-(sizeof(size_t)*8)))) \ ) /*