From 7606e3bf11a7cc612de8d773c17ad96330f29527 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 23 Sep 2002 18:35:12 +0000 Subject: [PATCH] Win32 fixes. --- archivers/qpak.c | 4 ++-- archivers/zip.c | 1 - physfs.dsp | 8 ++++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/archivers/qpak.c b/archivers/qpak.c index ed789d3c..17721b74 100644 --- a/archivers/qpak.c +++ b/archivers/qpak.c @@ -192,7 +192,7 @@ static int QPAK_isArchive(const char *filename, int forWriting) static int qpak_loadEntries(void *fh, int dirOffset, int numEntries, QPAKentry *entries) { - PHYSFS_uint32 i; + PHYSFS_sint32 i; BAIL_IF_MACRO(__PHYSFS_platformSeek(fh, dirOffset) == 0, NULL, 0); @@ -403,7 +403,7 @@ static QPAKentry *qpak_findEntry(QPAKdirectory *root, const char *name) static int qpak_populateDirectories(QPAKentry *entries, int numEntries, QPAKdirectory *root) { - PHYSFS_uint32 i; + PHYSFS_sint32 i; QPAKentry *entry = entries; for (i = 0; i < numEntries; i++, entry++) diff --git a/archivers/zip.c b/archivers/zip.c index 75d5188b..78042b3d 100644 --- a/archivers/zip.c +++ b/archivers/zip.c @@ -1293,7 +1293,6 @@ static PHYSFS_sint64 ZIP_getLastModTime(DirHandle *h, static int ZIP_isDirectory(DirHandle *h, const char *name, int *fileExists) { ZIPinfo *info = (ZIPinfo *) h->opaque; - PHYSFS_sint32 pos; int isDir; ZIPentry *entry = zip_find_entry(info, name, &isDir); diff --git a/physfs.dsp b/physfs.dsp index d15791f7..e06d7a8d 100644 --- a/physfs.dsp +++ b/physfs.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /WX /Gm /ZI /Od /I "." /I "zlibwin32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_ZIP" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /Ze /W3 /WX /Gm /ZI /Od /I "." /I "zlib114" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_ZIP" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /WX /Gm /ZI /Od /I "." /I "zlib114" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_ZIP" /D "PHYSFS_SUPPORTS_QPAK" /YX /FD /GZ /c # SUBTRACT CPP /X # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /WX /O2 /I "." /I "zlibwin32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_ZIP" /YX /FD /c -# ADD CPP /nologo /MD /Ze /W3 /WX /O2 /I "." /I "zlib114" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_ZIP" /YX /FD /c +# ADD CPP /nologo /MD /W3 /WX /O2 /I "." /I "zlib114" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_ZIP" /D "PHYSFS_SUPPORTS_QPAK" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -153,6 +153,10 @@ SOURCE=.\physfs_byteorder.c # End Source File # Begin Source File +SOURCE=.\archivers\qpak.c +# End Source File +# Begin Source File + SOURCE=.\zlib114\trees.c # End Source File # Begin Source File