From 49ebc305ac63c22fe3a58f852bc54e9bb8308996 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sat, 23 Jul 2005 22:01:03 +0000 Subject: [PATCH] More minor OS/2 tweaks. --- CHANGELOG | 1 + platform/os2.c | 33 +++++++++++++++++++++++++++++++++ platform/posix.c | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 86e1f8ff..0974e42b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 --git a/platform/os2.c b/platform/os2.c index 8daf754c..31d9f11a 100644 --- a/platform/os2.c +++ b/platform/os2.c @@ -741,6 +741,39 @@ void __PHYSFS_platformReleaseMutex(void *mutex) 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 --git a/platform/posix.c b/platform/posix.c index b6349f1d..9e4a6dc5 100644 --- a/platform/posix.c +++ b/platform/posix.c @@ -10,7 +10,7 @@ # include #endif -#if (!defined WIN32) +#if ((!defined WIN32) && (!defined OS2)) #if (defined __STRICT_ANSI__) #define __PHYSFS_DOING_STRICT_ANSI__