r730 - in trunk: . platform

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2005-07-23 18:01:03 -0400 (Sat, 23 Jul 2005)
New Revision: 730

Modified:
   trunk/CHANGELOG
   trunk/platform/os2.c
   trunk/platform/posix.c
Log:
More minor OS/2 tweaks.


Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2005-07-23 21:46:46 UTC (rev 729)
+++ trunk/CHANGELOG	2005-07-23 22:01:03 UTC (rev 730)
@@ -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

Modified: trunk/platform/os2.c
===================================================================
--- trunk/platform/os2.c	2005-07-23 21:46:46 UTC (rev 729)
+++ trunk/platform/os2.c	2005-07-23 22:01:03 UTC (rev 730)
@@ -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 ... */

Modified: trunk/platform/posix.c
===================================================================
--- trunk/platform/posix.c	2005-07-23 21:46:46 UTC (rev 729)
+++ trunk/platform/posix.c	2005-07-23 22:01:03 UTC (rev 730)
@@ -10,7 +10,7 @@
 #  include <config.h>
 #endif
 
-#if (!defined WIN32)
+#if ((!defined WIN32) && (!defined OS2))
 
 #if (defined __STRICT_ANSI__)
 #define __PHYSFS_DOING_STRICT_ANSI__