diff options
| author | leak <leak@bitmx.net> | 2014-06-22 16:29:49 +0200 |
|---|---|---|
| committer | leak <leak@bitmx.net> | 2014-06-22 16:29:49 +0200 |
| commit | bfcbde1c97971211d2ecdf5c5f8033eb138658d1 (patch) | |
| tree | 9d32b87a6d4ef9164faaeaf3eeb730cc368c1fe1 /src/server/shared/Utilities/Util.cpp | |
| parent | ca3327dbed76d7d13b9e2754990b717267700be9 (diff) | |
Various cleanups and fixes due to feedback
Diffstat (limited to 'src/server/shared/Utilities/Util.cpp')
| -rw-r--r-- | src/server/shared/Utilities/Util.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
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) { |