Builds on Mac Classic again.
authorRyan C. Gordon <icculus@icculus.org>
Mon, 14 Mar 2005 12:05:07 +0000
changeset 692 9c2381075c5e
parent 691 71d9affe0d8a
child 693 8913652feda4
Builds on Mac Classic again.
CHANGELOG
CWProjects.sitx
physfs.c
platform/macclassic.c
--- a/CHANGELOG	Mon Mar 14 11:49:30 2005 +0000
+++ b/CHANGELOG	Mon Mar 14 12:05:07 2005 +0000
@@ -5,7 +5,7 @@
 03132005 - More mount work, added PHYSFS_getMountPoint() and more cleanups.
            Replaced all the C runtime allocations with PhysFS allocation hooks.
            Added pocketpc.c to EXTRA_DIST. Added allocation hooks to some
-           platform drivers.
+           platform drivers. Updated Mac Classic build.
 03122005 - Added evil GOTO_*_MACRO_* macros. Fixed unix.c to compile again on
            MacOS X. Added PHYSFS_mount() (thanks, Philip!). Cleaned up the
            INSTALL and CREDITS files a little. Split off start of
Binary file CWProjects.sitx has changed
--- a/physfs.c	Mon Mar 14 11:49:30 2005 +0000
+++ b/physfs.c	Mon Mar 14 12:05:07 2005 +0000
@@ -1302,8 +1302,8 @@
     if (h->mountPoint != NULL)  /* NULL mountpoint means "/". */
     {
         size_t mntpntlen = strlen(h->mountPoint);
+        size_t len = strlen(fname);
         assert(mntpntlen > 1); /* root mount points should be NULL. */
-        size_t len = strlen(fname);
         /* not under the mountpoint, so skip this archive. */
         BAIL_IF_MACRO(len < mntpntlen-1, ERR_NO_SUCH_PATH, 0);
         /* !!! FIXME: Case insensitive? */
@@ -2065,11 +2065,5 @@
     allocator.Free = __PHYSFS_platformAllocatorFree;
 } /* setDefaultAllocator */
 
-
-PHYSFS_Allocator *__PHYSFS_getAllocator(void)
-{
-    return(&allocator);
-} /* __PHYFS_getAllocator */
-
 /* end of physfs.c ... */
 
--- a/platform/macclassic.c	Mon Mar 14 11:49:30 2005 +0000
+++ b/platform/macclassic.c	Mon Mar 14 12:05:07 2005 +0000
@@ -207,7 +207,7 @@
                 size = (size_t) volName[0];  /* convert to ASCIZ string... */
                 memmove(&volName[0], &volName[1], size);
                 volName[size] = '\0';
-                cb(data, volName);
+                cb(data, (const char *) volName);
             } /* if */
         } /* if */
 
@@ -619,8 +619,10 @@
         size = (size_t) str255[0];  /* (convert to ASCIZ string...) */
         memmove(&str255[0], &str255[1], size);
         str255[size] = '\0';
-        callback(callbackdata, str255);
+        callback(callbackdata, (const char *) str255);
     } /* for */
+
+    return(1);
 } /* macClassicEnumerateFiles */