From c6026d662ab26954460d5390934d6affa9c8127e Mon Sep 17 00:00:00 2001 From: lloyd Date: Wed, 23 Dec 2009 01:49:56 +0000 Subject: Fix compile of get_nanoseconds_clock for Windows. Add macros for OS support of gmtime_r (Unix) and gmtime_s (Win32) to deal with thread-unsafety of std::gmtime. Only enable gmtime_r on Linux currently, but it's probably available pretty much everywhere (specified in pthreads, origininally, AFAICT). --- src/utils/time.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/utils/time.cpp') diff --git a/src/utils/time.cpp b/src/utils/time.cpp index 04c83c7bd..e1e7d1f20 100644 --- a/src/utils/time.cpp +++ b/src/utils/time.cpp @@ -64,10 +64,20 @@ std::tm time_t_to_tm(u64bit timer) { std::time_t time_val = static_cast(timer); + std::tm tm; + +#if defined(BOTAN_TARGET_OS_HAS_GMTIME_S) + gmtime_s(&tm, &time_val); // Windows +#elif defined(BOTAN_TARGET_OS_HAS_GMTIME_R) + gmtime_r(&time_val, &tm); // Unix/SUSv2 +#else std::tm* tm_p = std::gmtime(&time_val); if (tm_p == 0) throw Encoding_Error("time_t_to_tm could not convert"); - return (*tm_p); + tm = *tm_p; +#endif + + return tm; } u64bit get_nanoseconds_clock() @@ -85,7 +95,7 @@ u64bit get_nanoseconds_clock() #elif defined(BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME) // Returns time since January 1, 1601 in 100-ns increments - struct FILETIME tv; + ::FILETIME tv; ::GetSystemTimeAsFileTime(&tv); u64bit tstamp = (static_cast(tv.dwHighDateTime) << 32) | tv.dwLowDateTime; -- cgit v1.2.3