Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

win32/win32.c: suppress warning redeclared

* win32/win32.c: suppress warning redeclared on mingw64.
  *_s functions are declared if MINGW_HAS_SECURE_API is defined.
  Follow up r36556.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 21aad667a56084896248918d18f6f8ed2a567753 1 parent 208e8db
@shirosaki shirosaki authored
Showing with 10 additions and 6 deletions.
  1. +6 −0 ChangeLog
  2. +4 −6 win32/win32.c
View
6 ChangeLog
@@ -1,3 +1,9 @@
+Sun Jul 29 06:21:04 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+
+ * win32/win32.c: suppress warning redeclared on mingw64.
+ *_s functions are declared if MINGW_HAS_SECURE_API is defined.
+ Follow up r36556.
+
Sun Jul 29 00:28:46 2012 Narihiro Nakamura <authornari@gmail.com>
* gc.c: remove unused initialization.
View
10 win32/win32.c
@@ -6618,14 +6618,12 @@ systemtime_to_localtime(TIME_ZONE_INFORMATION *tz, SYSTEMTIME *gst, SYSTEMTIME *
#endif
#ifdef __MINGW64__
-#ifndef gmtime_s
+# 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);
+# endif
# define gmtime_s _gmtime64_s
- errno_t gmtime_s(struct tm* _tm, const time_t *time);
-#endif
-#ifndef localtime_s
# define localtime_s _localtime64_s
- errno_t localtime_s(struct tm* _tm, const time_t *time);
-#endif
#endif
/* License: Ruby's */
Please sign in to comment.
Something went wrong with that request. Please try again.