diff --git a/ChangeLog b/ChangeLog
index a324ec8fa9..dc6787704b 100644
--- a/ChangeLog
+++ b/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.
diff --git a/win32/win32.c b/win32/win32.c
index c48979d913..979b90e15c 100644
--- a/win32/win32.c
+++ b/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 */