Killed some #ifdefs and whitespace.

icculus · Mar 10, 2007 · 9d42a71 · 9d42a71
1 parent d8f69c0
commit 9d42a71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 44 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -5,7 +5,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. Changed
-           PHYSFS_SUPPORTS_LZMA to PHYSFS_SUPPORTS_7Z.
+           PHYSFS_SUPPORTS_LZMA to PHYSFS_SUPPORTS_7Z. Killed some #ifdefs
+           in physfs.c.
 11052006 - More 7zip archiver work (thanks, Dennis!). Initial Unicode work.
            Minor BeOS realpath tweak.
 09272006 - Reworked 7zip archiver (thanks, Dennis!).

diff --git a/physfs.c b/physfs.c
@@ -54,85 +54,52 @@ typedef struct __PHYSFS_ERRMSGTYPE__
 } ErrMsg;
 
 
-/* The various i/o drivers... */
-/* !!! FIXME: consolidate these into one struct? */
-#if (defined PHYSFS_SUPPORTS_ZIP)
+/* The various i/o drivers...some of these may not be compiled in. */
 extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_ZIP;
 extern const PHYSFS_Archiver       __PHYSFS_Archiver_ZIP;
-#endif
-
-#if (defined PHYSFS_SUPPORTS_7Z)
 extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_LZMA;
 extern const PHYSFS_Archiver       __PHYSFS_Archiver_LZMA;
-#endif
-
-#if (defined PHYSFS_SUPPORTS_GRP)
 extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_GRP;
 extern const PHYSFS_Archiver       __PHYSFS_Archiver_GRP;
-#endif
-
-#if (defined PHYSFS_SUPPORTS_QPAK)
 extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_QPAK;
 extern const PHYSFS_Archiver       __PHYSFS_Archiver_QPAK;
-#endif
-
-#if (defined PHYSFS_SUPPORTS_HOG)
 extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_HOG;
 extern const PHYSFS_Archiver       __PHYSFS_Archiver_HOG;
-#endif
-
-#if (defined PHYSFS_SUPPORTS_MVL)
 extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_MVL;
 extern const PHYSFS_Archiver       __PHYSFS_Archiver_MVL;
-#endif
-
-#if (defined PHYSFS_SUPPORTS_WAD)
 extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_WAD;
 extern const PHYSFS_Archiver       __PHYSFS_Archiver_WAD;
-#endif
-
-#if (defined PHYSFS_SUPPORTS_MIX)
 extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_MIX;
 extern const PHYSFS_Archiver       __PHYSFS_Archiver_MIX;
-#endif
-
-extern const PHYSFS_Archiver  __PHYSFS_Archiver_DIR;
+extern const PHYSFS_Archiver       __PHYSFS_Archiver_DIR;
 
 
 static const PHYSFS_ArchiveInfo *supported_types[] =
 {
 #if (defined PHYSFS_SUPPORTS_ZIP)
     &__PHYSFS_ArchiveInfo_ZIP,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_7Z)
     &__PHYSFS_ArchiveInfo_LZMA,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_GRP)
     &__PHYSFS_ArchiveInfo_GRP,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_QPAK)
     &__PHYSFS_ArchiveInfo_QPAK,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_HOG)
     &__PHYSFS_ArchiveInfo_HOG,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_MVL)
     &__PHYSFS_ArchiveInfo_MVL,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_WAD)
     &__PHYSFS_ArchiveInfo_WAD,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_MIX)
     &__PHYSFS_ArchiveInfo_MIX,
 #endif
-
     NULL
 };
 
@@ -141,35 +108,27 @@ static const PHYSFS_Archiver *archivers[] =
 #if (defined PHYSFS_SUPPORTS_ZIP)
     &__PHYSFS_Archiver_ZIP,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_7Z)
     &__PHYSFS_Archiver_LZMA,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_GRP)
     &__PHYSFS_Archiver_GRP,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_QPAK)
     &__PHYSFS_Archiver_QPAK,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_HOG)
     &__PHYSFS_Archiver_HOG,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_MVL)
     &__PHYSFS_Archiver_MVL,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_WAD)
     &__PHYSFS_Archiver_WAD,
 #endif
-
 #if (defined PHYSFS_SUPPORTS_MIX)
     &__PHYSFS_Archiver_MIX,
 #endif
-
     &__PHYSFS_Archiver_DIR,
     NULL
 };