summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-20 09:06:05 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-20 09:06:05 +0000
commitc8270909e8cb32b92a29adb34948b953341c72d2 (patch)
tree7caa04b5f84e9dee86a81d851faf4c9745f97366
parentb75c93507f147fa94fb1e53c23a2657d2bbade5c (diff)
downloadruby-c8270909e8cb32b92a29adb34948b953341c72d2.tar.gz
ruby-c8270909e8cb32b92a29adb34948b953341c72d2.tar.xz
ruby-c8270909e8cb32b92a29adb34948b953341c72d2.zip
merges r23550 from trunk into ruby_1_9_1.
-- * ext/dl/lib/dl/cparser.rb (DL::CParser#parse_struct_signature): splitting with regexp source string is obsolete. a patch from Minwoo Lee at [ruby-core:23494]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/dl/lib/dl/cparser.rb2
-rw-r--r--version.h2
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 76c292e04..3c0e53aaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Sat May 23 18:48:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat May 23 18:53:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/dl/lib/dl/cparser.rb (DL::CParser#parse_struct_signature):
+ splitting with regexp source string is obsolete. a patch from
+ Minwoo Lee at [ruby-core:23494].
* ext/dl/cptr.c (rb_dlptr_cmp): return signed value, and restric
to Fixnum. [ruby-dev:38533]
diff --git a/ext/dl/lib/dl/cparser.rb b/ext/dl/lib/dl/cparser.rb
index fb75d9b20..a9bdb2e0f 100644
--- a/ext/dl/lib/dl/cparser.rb
+++ b/ext/dl/lib/dl/cparser.rb
@@ -2,7 +2,7 @@ module DL
module CParser
def parse_struct_signature(signature, tymap=nil)
if( signature.is_a?(String) )
- signature = signature.split("\s*,\s*")
+ signature = signature.split(/\s*,\s*/)
end
mems = []
tys = []
diff --git a/version.h b/version.h
index 1d26532a3..6744ee235 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 155
+#define RUBY_PATCHLEVEL 156
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1