Correct use of localtime() in Win32

[mono.git] / mono / sgen / sgen-gc.h

diff --git a/mono/sgen/sgen-gc.h b/mono/sgen/sgen-gc.h
index 655efdeb30e10c340aad669a21b56019dfdffb6b..fb264a4b070b8ec638928729400e554c5a9257ff 100644 (file)
--- a/mono/sgen/sgen-gc.h
+++ b/mono/sgen/sgen-gc.h
@@ -127,33 +127,38 @@ extern guint64 stat_objects_copied_major;
                g_error (__VA_ARGS__);  \
 } } while (0)
 
-
-#ifdef HOST_WIN32
-# define LOG_LOCALTIME localtime
+#ifndef HOST_WIN32
+# define LOG_TIMESTAMP  \
+       do {    \
+               time_t t;                                                                       \
+               struct tm tod;                                                                  \
+               time(&t);                                                                       \
+               localtime_r(&t, &tod);                                                          \
+               strftime(logTime, sizeof(logTime), "%F %T", &tod);                              \
+       } while (0)
 #else
-# define LOG_LOCALTIME localtime_r
+# define LOG_TIMESTAMP  \
+       do {    \
+               time_t t;                                                                       \
+               struct tm *tod;                                                                 \
+               time(&t);                                                                       \
+               tod = localtime(&t);                                                            \
+               strftime(logTime, sizeof(logTime), "%F %T", tod);                               \
+       } while (0)
 #endif
 
 #define SGEN_LOG(level, format, ...) do {      \
        if (G_UNLIKELY ((level) <= SGEN_MAX_DEBUG_LEVEL && (level) <= gc_debug_level)) {        \
-               time_t t;                                                                       \
-               struct tm tod;                                                                  \
                char logTime[80];                                                               \
-               time(&t);                                                                       \
-               LOG_LOCALTIME(&t, &tod);                                                        \
-               strftime(logTime, sizeof(logTime), "%F %T", &tod);                              \
+               LOG_TIMESTAMP;                                                                  \
                mono_gc_printf (gc_debug_file, "%s " format "\n", logTime, ##__VA_ARGS__);      \
 } } while (0)
 
 #define SGEN_COND_LOG(level, cond, format, ...) do {   \
        if (G_UNLIKELY ((level) <= SGEN_MAX_DEBUG_LEVEL && (level) <= gc_debug_level)) {                \
                if (cond) {                                                                             \
-                       time_t t;                                                                       \
-                       struct tm tod;                                                                  \
                        char logTime[80];                                                               \
-                       time(&t);                                                                       \
-                       LOG_LOCALTIME(&t,&tod);                                                         \
-                       strftime(logTime, sizeof(logTime), "%F %T", &tod);                              \
+                       LOG_TIMESTAMP;                                                                  \
                        mono_gc_printf (gc_debug_file, "%s " format "\n", logTime, ##__VA_ARGS__);      \
                }                                                                                       \
 } } while (0)