aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-11 15:21:49 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-11 15:21:49 +0000
commit98c084b8baf9a6f5226beec7009b2be2ff6fcef2 (patch)
treecfb89b2dc13b90163ae3ea1f22dff11f639b3c94
parentcb459dbe64792d3a5206f27dddbaa3d76345696f (diff)
downloadruby-98c084b8baf9a6f5226beec7009b2be2ff6fcef2.tar.gz
* win32/Makefile.sub (HAVE_QSORT_S): use qsort_s only for Visual Studio
2012 or later, because VS2010 seems to causes a SEGV in test/ruby/test_enum.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--win32/Makefile.sub2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ef87ccfcea..9f10118f16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 12 00:18:19 2016 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (HAVE_QSORT_S): use qsort_s only for Visual Studio
+ 2012 or later, because VS2010 seems to causes a SEGV in
+ test/ruby/test_enum.rb.
+
Wed May 11 23:59:47 2016 Masaya Tarui <tarui@ruby-lang.org>
* vm_insnhelper.c (vm_getivar): describe fast-path explicit
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index b10970a6d8..33cbceb988 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -741,7 +741,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define HAVE_TZNAME 1
#define HAVE_DAYLIGHT 1
#define HAVE_GMTIME_R 1
-!if $(RT_VER) >= 80
+!if $(RT_VER) >= 120
#define HAVE_QSORT_S
!endif
#define HAVE_TYPE_NET_LUID 1