r808 - trunk
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Mar 10 01:24:56 EST 2007
Author: icculus
Date: 2007-03-10 01:24:56 -0500 (Sat, 10 Mar 2007)
New Revision: 808
Modified:
trunk/CHANGELOG
trunk/physfs.c
Log:
Killed some #ifdefs and whitespace.
Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG 2007-03-09 08:17:56 UTC (rev 807)
+++ trunk/CHANGELOG 2007-03-10 06:24:56 UTC (rev 808)
@@ -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!).
Modified: trunk/physfs.c
===================================================================
--- trunk/physfs.c 2007-03-09 08:17:56 UTC (rev 807)
+++ trunk/physfs.c 2007-03-10 06:24:56 UTC (rev 808)
@@ -54,85 +54,52 @@
} 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 @@
#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
};
More information about the physfs-commits
mailing list