From f19ace8d33e468969d3329e6bb17d6c032147e91 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 14 Feb 2011 13:42:01 +0100 Subject: gmtime: remove define 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. --- lib/parsedate.c | 4 ++-- lib/setup_once.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/parsedate.c b/lib/parsedate.c index 1d7f035f2..1e9381c7d 100644 --- a/lib/parsedate.c +++ b/lib/parsedate.c @@ -529,9 +529,9 @@ CURLcode Curl_gmtime(time_t intime, struct tm *store) const struct tm *tm; #ifdef HAVE_GMTIME_R /* thread-safe version */ - tm = (struct tm *)(gmtime_r)(&intime, store); + tm = (struct tm *)gmtime_r(&intime, store); #else - tm = (gmtime)(&intime); + tm = gmtime(&intime); if(tm) *store = *tm; /* copy the pointed struct to the local copy */ #endif diff --git a/lib/setup_once.h b/lib/setup_once.h index e817b6dea..1b6fde527 100644 --- a/lib/setup_once.h +++ b/lib/setup_once.h @@ -488,8 +488,5 @@ typedef int sig_atomic_t; #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 */ -- cgit v1.2.3