From d8f69c0e93eaa2b8be16323cb02ef4af87ee8f10 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Fri, 9 Mar 2007 08:17:56 +0000
Subject: [PATCH] Changed PHYSFS_SUPPORTS_LZMA to PHYSFS_SUPPORTS_7Z.

---
 CHANGELOG        | 3 ++-
 archivers/lzma.c | 4 ++--
 physfs.c         | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c14f7be0..8e85fd40 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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!).
diff --git a/archivers/lzma.c b/archivers/lzma.c
index 4e31621f..8ecd823f 100644
--- a/archivers/lzma.c
+++ b/archivers/lzma.c
@@ -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 @@ const PHYSFS_Archiver __PHYSFS_Archiver_LZMA =
     LZMA_fileClose           /* fileClose() method      */
 };
 
-#endif  /* defined PHYSFS_SUPPORTS_LZMA */
+#endif  /* defined PHYSFS_SUPPORTS_7Z */
 
 /* end of lzma.c ... */
 
diff --git a/physfs.c b/physfs.c
index b65adc9b..7c67a878 100644
--- a/physfs.c
+++ b/physfs.c
@@ -55,13 +55,13 @@ typedef struct __PHYSFS_ERRMSGTYPE__
 
 
 /* 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 @@ static const PHYSFS_ArchiveInfo *supported_types[] =
     &__PHYSFS_ArchiveInfo_ZIP,
 #endif
 
-#if (defined PHYSFS_SUPPORTS_LZMA)
+#if (defined PHYSFS_SUPPORTS_7Z)
     &__PHYSFS_ArchiveInfo_LZMA,
 #endif
 
@@ -142,7 +142,7 @@ static const PHYSFS_Archiver *archivers[] =
     &__PHYSFS_Archiver_ZIP,
 #endif
 
-#if (defined PHYSFS_SUPPORTS_LZMA)
+#if (defined PHYSFS_SUPPORTS_7Z)
     &__PHYSFS_Archiver_LZMA,
 #endif