diff options
| author | sebres <sebres@users.sourceforge.net> | 2018-11-22 14:44:48 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2018-11-22 14:44:48 (GMT) |
| commit | c2ce99823eec77ebd96f226d73c0389e446c45b6 (patch) | |
| tree | a5109e16635cf0cab04f99c7f2dc0577a45d8618 | |
| parent | 1cf15d2b4dfa14df45471804f579f5e4e1cbfae2 (diff) | |
| parent | 5c59a6a5059cf906985e489dafe86a4b07b9f919 (diff) | |
| download | tcl-c2ce99823eec77ebd96f226d73c0389e446c45b6.zip tcl-c2ce99823eec77ebd96f226d73c0389e446c45b6.tar.gz tcl-c2ce99823eec77ebd96f226d73c0389e446c45b6.tar.bz2 | |
merge 8.6
| -rw-r--r-- | compat/zlib/contrib/minizip/miniunz.c | 2 | ||||
| -rw-r--r-- | compat/zlib/contrib/minizip/minizip.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compat/zlib/contrib/minizip/miniunz.c b/compat/zlib/contrib/minizip/miniunz.c index 3d65401..0518dd9 100644 --- a/compat/zlib/contrib/minizip/miniunz.c +++ b/compat/zlib/contrib/minizip/miniunz.c @@ -97,7 +97,7 @@ void change_file_date(filename,dosdate,tmu_date) SetFileTime(hFile,&ftm,&ftLastAcc,&ftm); CloseHandle(hFile); #else -#ifdef unix || __APPLE__ +#if defined(unix) || defined(__APPLE__) struct utimbuf ut; struct tm newdate; newdate.tm_sec = tmu_date.tm_sec; diff --git a/compat/zlib/contrib/minizip/minizip.c b/compat/zlib/contrib/minizip/minizip.c index 17582d0..2dd9f10 100644 --- a/compat/zlib/contrib/minizip/minizip.c +++ b/compat/zlib/contrib/minizip/minizip.c @@ -92,7 +92,7 @@ uLong filetime(f, tmzip, dt) return ret; } #else -#ifdef unix || __APPLE__ +#if defined(unix) || defined(__APPLE__) uLong filetime(f, tmzip, dt) char *f; /* name of file to get info on */ tm_zip *tmzip; /* return value: access, modific. and creation times */ |