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) 52668: [Backport #11692]

Browse source 
* signal.c: should also clear ruby_disable_gc.
	  [Bug #11692]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54340 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2016-03-28 17:21:19 +00:00
parent d27080e7c3
commit 387cc5166f
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Mar 29 02:08:40 2016 Koichi Sasada <ko1@atdot.net>
* signal.c: should also clear ruby_disable_gc.
[Bug #11692]
Tue Mar 29 02:04:18 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (rb_f_catch): [DOC] fix malformed RDoc syntax, "+...+"

2
signal.c
View file

@ -745,7 +745,7 @@ rb_get_next_signal(void)
#if defined SIGSEGV || defined SIGBUS || defined SIGILL || defined SIGFPE
static const char *received_signal;
# define clear_received_signal() (void)(received_signal = 0)
# define clear_received_signal() (void)(ruby_disable_gc = 0, received_signal = 0)
#else
# define clear_received_signal() ((void)0)
#endif

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.5"
#define RUBY_RELEASE_DATE "2016-03-29"
#define RUBY_PATCHLEVEL 282
#define RUBY_PATCHLEVEL 283
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3