moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-10-31 15:45:12 -04:00
Code Issues Releases Wiki Activity

gmtime: remove define

Browse Source 
It turns out some systems rely on the gmtime or gmtime_r to be defined
already in the system headers and thus my "precaution" redefining of
them only caused trouble. They are now removed.
This commit is contained in:
Daniel Stenberg 2011-02-14 13:42:01 +01:00
parent c2dff28c41
commit f19ace8d33
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/parsedate.c
View File

@ -529,9 +529,9 @@ CURLcode Curl_gmtime(time_t intime, struct tm *store)
const struct tm *tm; const struct tm *tm;
#ifdef HAVE_GMTIME_R #ifdef HAVE_GMTIME_R
/* thread-safe version */ /* thread-safe version */
tm = (struct tm *)(gmtime_r)(&intime, store); tm = (struct tm *)gmtime_r(&intime, store);
#else #else
tm = (gmtime)(&intime); tm = gmtime(&intime);
if(tm) if(tm)
*store = *tm; /* copy the pointed struct to the local copy */ *store = *tm; /* copy the pointed struct to the local copy */
#endif #endif

3
lib/setup_once.h
View File

@ -488,8 +488,5 @@ typedef int sig_atomic_t;
#define ZERO_NULL 0 #define ZERO_NULL 0
#define gmtime(x) do_not_use_gmtime_use_Curl_gmtime()
#define gmtime_r(x,y) do_not_use_gmtime_r_use_Curl_gmtime()
#endif /* __SETUP_ONCE_H */ #endif /* __SETUP_ONCE_H */