From 713de7566c5d28cea5f0402b6a6c666c0f55f8c1 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 25 Dec 2014 08:33:22 +0000 Subject: merge revision(s) 48997: [Backport #10640] * configure.in (NET_LUID): include winsock2.h instead of windows.h. patch by Jon Forums in [ruby-core:67125]. [Bug #10640] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@48998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 5a7dbf826d..79e7fecfb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 25 17:31:51 2014 Nobuyoshi Nakada + + * configure.in (NET_LUID): include winsock2.h instead of windows.h. + patch by Jon Forums in [ruby-core:67125]. [Bug #10640] + Thu Dec 25 16:01:19 2014 Nobuyoshi Nakada * file.c (rb_file_expand_path_internal): drop characters ignored -- cgit v1.2.3 From 364be8e7c214106f4c6e3f9f6cb75a54addb237f Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 25 Dec 2014 08:38:14 +0000 Subject: merge revision(s) 48999: [Backport #10646] * gc.c (wmap_final_func): fix memory size shortage when realloc wmap. Fix SEGV during finilize of WeakRef on Solaris (though the SEGV could occur on all OS/platforms). [ruby-dev:48779] [Bug #10646] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 79e7fecfb4..30908e72f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Dec 25 17:37:47 2014 Naohisa Goto + + * gc.c (wmap_final_func): fix memory size shortage when realloc wmap. + Fix SEGV during finilize of WeakRef on Solaris (though the SEGV + could occur on all OS/platforms). [ruby-dev:48779] [Bug #10646] + Thu Dec 25 17:31:51 2014 Nobuyoshi Nakada * configure.in (NET_LUID): include winsock2.h instead of windows.h. -- cgit v1.2.3