kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 44406: [Backport #9324]

Browse source 
* configure.in: let mingw do something black-magic, and check if
	  _gmtime64_s() is available actually.

	* win32/win32.c (gmtime_s, localtime_s): use _gmtime64_s() and
	  _localtime64_s() if available, not depending on very confusing
	  mingw variants macros.  based on the patch by phasis68 (Heesob
	  Park) at [ruby-core:58764].  [ruby-core:58391] [Bug #9119]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-01-31 03:07:00 +00:00
parent 342ed0b857
commit edacfadad6
4 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Fri Jan 31 12:05:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: let mingw do something black-magic, and check if
_gmtime64_s() is available actually.
* win32/win32.c (gmtime_s, localtime_s): use _gmtime64_s() and
_localtime64_s() if available, not depending on very confusing
mingw variants macros. based on the patch by phasis68 (Heesob
Park) at [ruby-core:58764]. [ruby-core:58391] [Bug #9119]
Thu Jan 30 15:02:35 2014 Shugo Maeda <shugo@ruby-lang.org>
* configure.in: use $@ instead of $(.TARGET) because .TARGET is not

2
configure.in
View file

@ -888,6 +888,7 @@ AC_ARG_WITH(winnt-ver,
AS_CASE(["$target_os"],
[mingw*], [
RUBY_APPEND_OPTION(CPPFLAGS, -D_WIN32_WINNT=$with_winnt_ver)
RUBY_APPEND_OPTION(CPPFLAGS, -D__MINGW_USE_VC2005_COMPAT)
])
AS_CASE(["$target_os"],
@ -1040,6 +1041,7 @@ main()
if test x"$ac_cv_type_NET_LUID" = xyes; then
AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
fi
AC_CHECK_FUNCS(_gmtime64_s)
AC_LIBOBJ([langinfo])
],
[os2-emx*], [ LIBS="-lm $LIBS"

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.1"
#define RUBY_RELEASE_DATE "2014-01-30"
#define RUBY_PATCHLEVEL 11
#define RUBY_RELEASE_DATE "2014-01-31"
#define RUBY_PATCHLEVEL 12
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 30
#define RUBY_RELEASE_DAY 31
#include "ruby/version.h"

12
win32/win32.c
View file

@ -6965,7 +6965,7 @@ rb_w32_fd_is_text(int fd)
return _osfile(fd) & FTEXT;
}
#if RUBY_MSVCRT_VERSION < 80 && !defined(__MINGW64__)
#if RUBY_MSVCRT_VERSION < 80 && !defined(HAVE__GMTIME64_S)
/* License: Ruby's */
static int
unixtime_to_systemtime(const time_t t, SYSTEMTIME *st)
@ -7027,7 +7027,11 @@ systemtime_to_localtime(TIME_ZONE_INFORMATION *tz, SYSTEMTIME *gst, SYSTEMTIME *
}
#endif
#ifdef __MINGW64__
#ifdef HAVE__GMTIME64_S
# ifndef HAVE__LOCALTIME64_S
/* assume same as _gmtime64_s() */
# define HAVE__LOCALTIME64_S 1
# endif
# 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);
@ -7046,7 +7050,7 @@ gmtime_r(const time_t *tp, struct tm *rp)
errno = e;
return NULL;
}
#if RUBY_MSVCRT_VERSION >= 80 || defined(__MINGW64__)
#if RUBY_MSVCRT_VERSION >= 80 || defined(HAVE__GMTIME64_S)
e = gmtime_s(rp, tp);
if (e != 0) goto error;
#else
@ -7070,7 +7074,7 @@ localtime_r(const time_t *tp, struct tm *rp)
errno = e;
return NULL;
}
#if RUBY_MSVCRT_VERSION >= 80 || defined(__MINGW64__)
#if RUBY_MSVCRT_VERSION >= 80 || defined(HAVE__LOCALTIME64_S)
e = localtime_s(rp, tp);
if (e) goto error;
#else