зеркало из https://github.com/github/ruby.git
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
This commit is contained in:
Родитель
208e8db622
Коммит
21aad667a5
|
@ -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.
|
||||
|
|
|
@ -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 */
|
||||
|
|
Загрузка…
Ссылка в новой задаче