summaryrefslogtreecommitdiffhomepage
path: root/src/time.c
diff options
context:
space:
mode:
authorDaniel Bovensiepen <[email protected]>2012-05-16 11:34:00 -0700
committerDaniel Bovensiepen <[email protected]>2012-05-16 11:34:00 -0700
commit0cc8dcc0ee658eca9193a5611104f6d05cb958fd (patch)
tree0c123371d208a692f80197c1b0babb631302442a /src/time.c
parent3bec8b330c58a7ac9a73ed3689b1bd9cde389c16 (diff)
parent25415302399055a566e4d55b6c165937943aa678 (diff)
downloadmruby-0cc8dcc0ee658eca9193a5611104f6d05cb958fd.tar.gz
mruby-0cc8dcc0ee658eca9193a5611104f6d05cb958fd.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/time.c')
-rw-r--r--src/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/time.c b/src/time.c
index 5e75152e6..b0a74d0d1 100644
--- a/src/time.c
+++ b/src/time.c
@@ -28,8 +28,8 @@
#ifdef _WIN32
/* Win32 platform do not provide gmtime_r/localtime_r; emulate them using gmtime_s/localtime_s */
#if _MVC_VER
-#define gmtime_r(tp, tm) ((gmtime_s((tm), (tp)) == 0) ? (tp) : NULL)
-#define localtime_r(tp, tm) ((localtime_s((tm), (tp)) == 0) ? (tp) : NULL)
+#define gmtime_r(tp, tm) ((gmtime_s((tm), (tp)) == 0) ? (tm) : NULL)
+#define localtime_r(tp, tm) ((localtime_s((tm), (tp)) == 0) ? (tm) : NULL)
#else
#define NO_GMTIME_R
#endif