diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 20:09:27 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 20:09:27 +0000 |
commit | 35c546104b00e1e773bcdfd59bb0cd580c85b190 (patch) | |
tree | 976b1e7f7c88be80feaca6216b54a763458b9319 /version.h | |
parent | 0c8cfb4eabc5c00e17439a61d274e8c74eefeef2 (diff) |
merge revision(s) 32712,32718,32719: [Backport #6014]
* ext/dl/cfunc.c (dlcfunc_mark), ext/dl/cptr.c (dlptr_mark):
workaround to mark wrapped object. this is not a true fix,
because [Bug #4929] is caused by the interface design of DL.
* ext/dl/cptr.c (rb_dlptr_s_to_ptr): fix wrapping condition.
* ext/dl/cptr.c (rb_dlptr_s_to_ptr): fix wrapping condition.
* ext/dl/cptr.c (rb_dlptr_s_to_ptr): use rb_check_funcall.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 114 +#define RUBY_PATCHLEVEL 115 #define RUBY_RELEASE_DATE "2012-02-15" #define RUBY_RELEASE_YEAR 2012 |