From bfcbde1c97971211d2ecdf5c5f8033eb138658d1 Mon Sep 17 00:00:00 2001 From: leak Date: Sun, 22 Jun 2014 16:29:49 +0200 Subject: Various cleanups and fixes due to feedback --- src/server/shared/Utilities/Util.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/server/shared/Utilities/Util.cpp') diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index f80730af05d..1290a7dbae4 100644 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -139,16 +139,13 @@ void stripLineInvisibleChars(std::string &str) } +#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) struct tm* localtime_r(const time_t* time, struct tm *result) { -#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) localtime_s(result, time); return result; -#else - return localtime_r(&time, &result); // POSIX -#endif } - +#endif std::string secsToTimeString(uint64 timeInSecs, bool shortText, bool hoursOnly) { -- cgit v1.2.3