diff --git a/ChangeLog b/ChangeLog index 0d57814ddf..b1c62526fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 26 21:52:16 2016 Joseph Tibbertsma + + * gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name. + [Fix GH-1221] + Mon Jan 18 00:34:41 2016 Koichi Sasada * vm_insnhelper.c (vm_call_method): should not set fastpath diff --git a/gc.c b/gc.c index 295d24d2f3..5ebb9376d9 100644 --- a/gc.c +++ b/gc.c @@ -930,7 +930,7 @@ tick(void) #define RVALUE_LONG_LIVED_BITMAP(obj) MARKED_IN_BITMAP(GET_HEAP_LONG_LIVED_BITS(obj), (obj)) #define RVALUE_MARKING_BITMAP(obj) MARKED_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), (obj)) -#define RVALUE_PAGE_WB_UNPROTECTED(apge, obj) MARKED_IN_BITMAP((page)->wb_unprotected_bits, (obj)) +#define RVALUE_PAGE_WB_UNPROTECTED(page, obj) MARKED_IN_BITMAP((page)->wb_unprotected_bits, (obj)) #define RVALUE_PAGE_LONG_LIVED(page, obj) MARKED_IN_BITMAP((page)->long_lived_bits, (obj)) #define RVALUE_PAGE_MARKING(page, obj) MARKED_IN_BITMAP((page)->marking_bits, (obj)) diff --git a/version.h b/version.h index 3b9822ce66..38fed768a5 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.5" -#define RUBY_RELEASE_DATE "2016-01-18" -#define RUBY_PATCHLEVEL 236 +#define RUBY_RELEASE_DATE "2016-01-26" +#define RUBY_PATCHLEVEL 237 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 18 +#define RUBY_RELEASE_DAY 26 #include "ruby/version.h"