stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8215976: Fix gmtime_r declaration conflicts in zip.cpp with linux header files

Browse Source 
Reviewed-by: dholmes, rriggs
This commit is contained in:
Patrick Zhang 2019-01-03 17:39:39 +08:00 committed by Roger Riggs
parent 033465d815
commit aa5637f24e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jdk.pack/share/native/common-unpack/zip.cpp
View File

@ -416,9 +416,11 @@ uLong jar::dostime(int y, int n, int d, int h, int m, int s) {
((uLong)h << 11) | ((uLong)m << 5) | ((uLong)s >> 1); ((uLong)h << 11) | ((uLong)m << 5) | ((uLong)s >> 1);
} }
#ifdef _REENTRANT // solaris /*
extern "C" struct tm *gmtime_r(const time_t *, struct tm *); * For thread-safe reasons, non-Windows platforms need gmtime_r
#else * while Windows can directly use gmtime that is already thread-safe.
*/
#ifdef _MSC_VER
#define gmtime_r(t, s) gmtime(t) #define gmtime_r(t, s) gmtime(t)
#endif #endif
/* /*