walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge with pocketpc removal.

This commit is contained in:
Ryan C. Gordon 2012-03-10 01:13:03 -05:00
parent 6e4279e76a
commit c8fc8cf957
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/archiver_zip.c
View File

@ -9,10 +9,8 @@
#if (defined PHYSFS_SUPPORTS_ZIP) #if (defined PHYSFS_SUPPORTS_ZIP)
#ifndef _WIN32_WCE
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>
#endif
#include "zlib.h" #include "zlib.h"
@ -144,9 +142,7 @@ static const char *zlib_error_string(int rc)
{ {
case Z_OK: return NULL; /* not an error. */ case Z_OK: return NULL; /* not an error. */
case Z_STREAM_END: return NULL; /* not an error. */ case Z_STREAM_END: return NULL; /* not an error. */
#ifndef _WIN32_WCE
case Z_ERRNO: return strerror(errno); case Z_ERRNO: return strerror(errno);
#endif
case Z_NEED_DICT: return ERR_NEED_DICT; case Z_NEED_DICT: return ERR_NEED_DICT;
case Z_DATA_ERROR: return ERR_DATA_ERROR; case Z_DATA_ERROR: return ERR_DATA_ERROR;
case Z_MEM_ERROR: return ERR_MEMORY_ERROR; case Z_MEM_ERROR: return ERR_MEMORY_ERROR;
@ -897,12 +893,6 @@ static int zip_has_symlink_attr(ZIPentry *entry, PHYSFS_uint32 extern_attr)
static PHYSFS_sint64 zip_dos_time_to_physfs_time(PHYSFS_uint32 dostime) static PHYSFS_sint64 zip_dos_time_to_physfs_time(PHYSFS_uint32 dostime)
{ {
#ifdef _WIN32_WCE
/* We have no struct tm and no mktime right now.
FIXME: This should probably be fixed at some point.
*/
return -1;
#else
PHYSFS_uint32 dosdate; PHYSFS_uint32 dosdate;
struct tm unixtime; struct tm unixtime;
memset(&unixtime, '\0', sizeof (unixtime)); memset(&unixtime, '\0', sizeof (unixtime));
@ -924,7 +914,6 @@ static PHYSFS_sint64 zip_dos_time_to_physfs_time(PHYSFS_uint32 dostime)
unixtime.tm_isdst = -1; unixtime.tm_isdst = -1;
return ((PHYSFS_sint64) mktime(&unixtime)); return ((PHYSFS_sint64) mktime(&unixtime));
#endif
} /* zip_dos_time_to_physfs_time */ } /* zip_dos_time_to_physfs_time */