From 3a756aa2c32942b3c5dd63345f381866d87389aa Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 21 May 2009 14:47:38 +0000 Subject: merges r23382 from trunk into ruby_1_9_1. -- * ext/dl/lib/dl/cparser.rb (DL::CParser#parse_signature): strips spaces. based on a patch from Takashi Tamura in [ruby-dev:38398]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/dl/lib/dl/cparser.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c71693517..26eacd0b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun May 10 10:40:02 2009 Nobuyoshi Nakada + + * ext/dl/lib/dl/cparser.rb (DL::CParser#parse_signature): strips + spaces. based on a patch from Takashi Tamura in [ruby-dev:38398]. + Sat May 9 11:14:50 2009 Nobuyoshi Nakada * vm_eval.c (rb_f_catch): gets rid of issue with gcc 4.4. a patch diff --git a/ext/dl/lib/dl/cparser.rb b/ext/dl/lib/dl/cparser.rb index c897d1b69..fb75d9b20 100644 --- a/ext/dl/lib/dl/cparser.rb +++ b/ext/dl/lib/dl/cparser.rb @@ -41,7 +41,7 @@ module DL case signature when /^([\d\w@\*_\s]+)\(([\d\w\*_\s\,\[\]]*)\)$/ ret = $1 - args = $2 + (args = $2).strip! ret = ret.split(/\s+/) args = args.split(/\s*,\s*/) func = ret.pop diff --git a/version.h b/version.h index cf93fec10..6049ef2da 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-05-12" -#define RUBY_PATCHLEVEL 134 +#define RUBY_PATCHLEVEL 135 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit