diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-23 04:49:42 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-23 04:49:42 +0000 |
commit | 109ea6449ec063dc53ff778af3d6be68091071fe (patch) | |
tree | f7f9eb867cb83b9aac4ffc939aaff4dc67f75273 /version.h | |
parent | 396a07307e4180f218958ffc4edf116b6bbc93e1 (diff) |
merge revision(s) 31667:
merge revision(s) 28080:
* ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
This caused failure when test/csv is executed with GC.stress = true.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2011-05-23" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20110523 -#define RUBY_PATCHLEVEL 345 +#define RUBY_PATCHLEVEL 346 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |