c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation errors on Windows.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2019-04-28 10:22:49 -07:00
parent b9cb4e6a4d
commit cd3e9e12d2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mz_zip.c
View File

@ -46,10 +46,9 @@
#include <stdio.h> /* snprintf */ #include <stdio.h> /* snprintf */
#if defined(_MSC_VER) #if defined(_MSC_VER)
# define localtime_r(t1,t2) localtime_s(t2,t1)
# if (_MSC_VER < 1900) # if (_MSC_VER < 1900)
# define snprintf _snprintf # define snprintf _snprintf
# else
# define localtime_r(t1,t2) localtime_s(t2,t1)
# endif # endif
#endif #endif
@ -2574,14 +2573,16 @@ time_t mz_zip_dosdate_to_time_t(uint64_t dos_date)
int32_t mz_zip_time_t_to_tm(time_t unix_time, struct tm *ptm) int32_t mz_zip_time_t_to_tm(time_t unix_time, struct tm *ptm)
{ {
struct tm ltm;
if (ptm == NULL) if (ptm == NULL)
return MZ_PARAM_ERROR; return MZ_PARAM_ERROR;
if (localtime_r(&unix_time, ptm) == 0) /* Returns a 1900-based year */ if (localtime_r(&unix_time, &ltm) == 0) /* Returns a 1900-based year */
{ {
/* Invalid date stored, so don't return it */ /* Invalid date stored, so don't return it */
memset(ptm, 0, sizeof(struct tm)); memset(ptm, 0, sizeof(struct tm));
return MZ_INTERNAL_ERROR; return MZ_INTERNAL_ERROR;
} }
memcpy(ptm, &ltm, sizeof(struct tm));
return MZ_OK; return MZ_OK;
} }