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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c716935176..26eacd0b02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 10 10:40:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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  <nobu@ruby-lang.org>
 
 	* 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 c897d1b69f..fb75d9b205 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 cf93fec10b..6049ef2da2 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