summaryrefslogtreecommitdiff
path: root/win32/win32.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-25 04:00:59 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-25 04:00:59 +0000
commit58a7cdaaf0fe70f7db1b703f6da40372f2ee938f (patch)
tree1f2d95ae60c9f3569dc88882ed627ceeab3d2cde /win32/win32.c
parentcf0540cf55d3f2472a6f7c35f919b6880e355c4d (diff)
win32/win32.c: mingw jungle
* configure.in: let mingw do something black-magic, and check if _gmtime64_s() is available actually. * win32/win32.c (gmtime_s, localtime_s): use _gmtime64_s() and _localtime64_s() if available, not depending on very confusing mingw variants macros. based on the patch by phasis68 (Heesob Park) at [ruby-core:58764]. [ruby-core:58391] [Bug #9119] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.c')
-rw-r--r--win32/win32.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/win32/win32.c b/win32/win32.c
index 9cbd07f..2c888ae 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -6965,7 +6965,7 @@ rb_w32_fd_is_text(int fd)
return _osfile(fd) & FTEXT;
}
-#if RUBY_MSVCRT_VERSION < 80 && !defined(__MINGW64__)
+#if RUBY_MSVCRT_VERSION < 80 && !defined(HAVE__GMTIME64_S)
/* License: Ruby's */
static int
unixtime_to_systemtime(const time_t t, SYSTEMTIME *st)
@@ -7027,7 +7027,11 @@ systemtime_to_localtime(TIME_ZONE_INFORMATION *tz, SYSTEMTIME *gst, SYSTEMTIME *
}
#endif
-#ifdef __MINGW64__
+#ifdef HAVE__GMTIME64_S
+# ifndef HAVE__LOCALTIME64_S
+/* assume same as _gmtime64_s() */
+# define HAVE__LOCALTIME64_S 1
+# endif
# ifndef MINGW_HAS_SECURE_API
_CRTIMP errno_t __cdecl _gmtime64_s(struct tm* tm, const __time64_t *time);
_CRTIMP errno_t __cdecl _localtime64_s(struct tm* tm, const __time64_t *time);
@@ -7046,7 +7050,7 @@ gmtime_r(const time_t *tp, struct tm *rp)
errno = e;
return NULL;
}
-#if RUBY_MSVCRT_VERSION >= 80 || defined(__MINGW64__)
+#if RUBY_MSVCRT_VERSION >= 80 || defined(HAVE__GMTIME64_S)
e = gmtime_s(rp, tp);
if (e != 0) goto error;
#else
@@ -7070,7 +7074,7 @@ localtime_r(const time_t *tp, struct tm *rp)
errno = e;
return NULL;
}
-#if RUBY_MSVCRT_VERSION >= 80 || defined(__MINGW64__)
+#if RUBY_MSVCRT_VERSION >= 80 || defined(HAVE__LOCALTIME64_S)
e = localtime_s(rp, tp);
if (e) goto error;
#else