# HG changeset patch # User Ryan C. Gordon # Date 1122156063 0 # Node ID ae8bc98885538fa1030eb3079a1830970eac1d10 # Parent d6bf881b6e1ee46a3a9fa7f35be505d30ceafaa6 More minor OS/2 tweaks. diff -r d6bf881b6e1e -r ae8bc9888553 CHANGELOG --- a/CHANGELOG Sat Jul 23 21:46:07 2005 +0000 +++ b/CHANGELOG Sat Jul 23 22:01:03 2005 +0000 @@ -3,6 +3,7 @@ */ 07232005 - Fixed bug in zip archiver (thanks, Jörg Walter!). + More minor OS/2 tweaks. 07212005 - Patched to compile on OS/2 again. 07132005 - Updated zlib to 1.2.2, and patched it for this security hole: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-2096 diff -r d6bf881b6e1e -r ae8bc9888553 platform/os2.c --- a/platform/os2.c Sat Jul 23 21:46:07 2005 +0000 +++ b/platform/os2.c Sat Jul 23 22:01:03 2005 +0000 @@ -741,6 +741,39 @@ DosReleaseMutexSem((HMTX) mutex); } /* __PHYSFS_platformReleaseMutex */ + +int __PHYSFS_platformAllocatorInit(void) +{ + return(1); /* always succeeds. */ +} /* __PHYSFS_platformAllocatorInit */ + + +void __PHYSFS_platformAllocatorDeinit(void) +{ + /* no-op */ +} /* __PHYSFS_platformAllocatorInit */ + + +void *__PHYSFS_platformAllocatorMalloc(size_t s) +{ + #undef malloc + return(malloc(s)); +} /* __PHYSFS_platformMalloc */ + + +void *__PHYSFS_platformAllocatorRealloc(void *ptr, size_t s) +{ + #undef realloc + return(realloc(ptr, s)); +} /* __PHYSFS_platformRealloc */ + + +void __PHYSFS_platformAllocatorFree(void *ptr) +{ + #undef free + free(ptr); +} /* __PHYSFS_platformAllocatorFree */ + #endif /* defined OS2 */ /* end of os2.c ... */ diff -r d6bf881b6e1e -r ae8bc9888553 platform/posix.c --- a/platform/posix.c Sat Jul 23 21:46:07 2005 +0000 +++ b/platform/posix.c Sat Jul 23 22:01:03 2005 +0000 @@ -10,7 +10,7 @@ # include #endif -#if (!defined WIN32) +#if ((!defined WIN32) && (!defined OS2)) #if (defined __STRICT_ANSI__) #define __PHYSFS_DOING_STRICT_ANSI__