shirosaki	2012-07-29 06:41:37 +0900 (Sun, 29 Jul 2012)

  New Revision: 36563

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36563

  Log:
    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.

  Modified files:
    trunk/ChangeLog
    trunk/win32/win32.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36562)
+++ ChangeLog	(revision 36563)
@@ -1,3 +1,9 @@
+Sun Jul 29 06:21:04 2012  Hiroshi Shirosaki  <h.shirosaki@g...>
+
+	* 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@g...>
 
 	* gc.c: remove unused initialization.
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 36562)
+++ win32/win32.c	(revision 36563)
@@ -6618,15 +6618,13 @@
 #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 */
 struct tm *

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/