From 21aad667a56084896248918d18f6f8ed2a567753 Mon Sep 17 00:00:00 2001 From: shirosaki Date: Sat, 28 Jul 2012 21:41:37 +0000 Subject: 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 --- win32/win32.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'win32') 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 */ -- cgit v1.2.3