r807 - in trunk: . archivers

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2007-03-09 03:17:56 -0500 (Fri, 09 Mar 2007)
New Revision: 807

Modified:
   trunk/CHANGELOG
   trunk/archivers/lzma.c
   trunk/physfs.c
Log:
Changed PHYSFS_SUPPORTS_LZMA to PHYSFS_SUPPORTS_7Z.


Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2007-03-09 08:16:32 UTC (rev 806)
+++ trunk/CHANGELOG	2007-03-09 08:17:56 UTC (rev 807)
@@ -4,7 +4,8 @@
 
 03082007 - Fixed a comment in physfs.h. Renamed win32.c to windows.c.
            Cleaned up whitespace/formatting in pocketpc.c. Updated PocketPC
-           code to expect UTF-8 strings from the higher level.
+           code to expect UTF-8 strings from the higher level. Changed
+           PHYSFS_SUPPORTS_LZMA to PHYSFS_SUPPORTS_7Z.
 11052006 - More 7zip archiver work (thanks, Dennis!). Initial Unicode work.
            Minor BeOS realpath tweak.
 09272006 - Reworked 7zip archiver (thanks, Dennis!).

Modified: trunk/archivers/lzma.c
===================================================================
--- trunk/archivers/lzma.c	2007-03-09 08:16:32 UTC (rev 806)
+++ trunk/archivers/lzma.c	2007-03-09 08:17:56 UTC (rev 807)
@@ -11,7 +11,7 @@
 #  include <config.h>
 #endif
 
-#if (defined PHYSFS_SUPPORTS_LZMA)
+#if (defined PHYSFS_SUPPORTS_7Z)
 
 #include <stdlib.h>
 #include <string.h>
@@ -680,7 +680,7 @@
     LZMA_fileClose           /* fileClose() method      */
 };
 
-#endif  /* defined PHYSFS_SUPPORTS_LZMA */
+#endif  /* defined PHYSFS_SUPPORTS_7Z */
 
 /* end of lzma.c ... */
 

Modified: trunk/physfs.c
===================================================================
--- trunk/physfs.c	2007-03-09 08:16:32 UTC (rev 806)
+++ trunk/physfs.c	2007-03-09 08:17:56 UTC (rev 807)
@@ -55,13 +55,13 @@
 
 
 /* The various i/o drivers... */
-
+/* !!! FIXME: consolidate these into one struct? */
 #if (defined PHYSFS_SUPPORTS_ZIP)
 extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_ZIP;
 extern const PHYSFS_Archiver       __PHYSFS_Archiver_ZIP;
 #endif
 
-#if (defined PHYSFS_SUPPORTS_LZMA)
+#if (defined PHYSFS_SUPPORTS_7Z)
 extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_LZMA;
 extern const PHYSFS_Archiver       __PHYSFS_Archiver_LZMA;
 #endif
@@ -105,7 +105,7 @@
     &__PHYSFS_ArchiveInfo_ZIP,
 #endif
 
-#if (defined PHYSFS_SUPPORTS_LZMA)
+#if (defined PHYSFS_SUPPORTS_7Z)
     &__PHYSFS_ArchiveInfo_LZMA,
 #endif
 
@@ -142,7 +142,7 @@
     &__PHYSFS_Archiver_ZIP,
 #endif
 
-#if (defined PHYSFS_SUPPORTS_LZMA)
+#if (defined PHYSFS_SUPPORTS_7Z)
     &__PHYSFS_Archiver_LZMA,
 #endif