ruby-changes:45858
From: naruse <ko1@a...>
Date: Mon, 13 Mar 2017 01:59:18 +0900 (JST)
Subject: [ruby-changes:45858] naruse:r57922 (ruby_2_4): merge revision(s) 57763:
naruse 2017-03-13 01:22:05 +0900 (Mon, 13 Mar 2017) New Revision: 57922 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57922 Log: merge revision(s) 57763: fix for mingw64 * util.c: define MINGW_HAS_SECURE_API for qsort_s on recent mingw64. Modified directories: branches/ruby_2_4/ Modified files: branches/ruby_2_4/util.c branches/ruby_2_4/version.h Index: ruby_2_4/util.c =================================================================== --- ruby_2_4/util.c (revision 57921) +++ ruby_2_4/util.c (revision 57922) @@ -9,6 +9,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/util.c#L9 **********************************************************************/ +#if defined __MINGW32__ || defined __MINGW64__ +#define MINGW_HAS_SECURE_API 1 +#endif + #include "internal.h" #include <ctype.h> Index: ruby_2_4/version.h =================================================================== --- ruby_2_4/version.h (revision 57921) +++ ruby_2_4/version.h (revision 57922) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1 #define RUBY_VERSION "2.4.0" #define RUBY_RELEASE_DATE "2017-03-13" -#define RUBY_PATCHLEVEL 77 +#define RUBY_PATCHLEVEL 78 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 Property changes on: ruby_2_4 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r57763 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/