summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-29 07:18:47 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-29 07:18:47 +0000
commit0278b58415ae058f6004190b121ed782a6e0d8c3 (patch)
tree8bf02591c66e37f4c65edb15f32c1ae4e9314eb4
parent91cf7698e11caddab11567ad7bc9a3774941659c (diff)
merges r21138 from trunk into ruby_1_9_1.
* ext/dl/lib/dl/import.rb (DL::Importer#sizeof): follows a feature change in 1.9. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/dl/lib/dl/import.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f46922d3b1..fffb93dbd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 28 21:09:12 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * ext/dl/lib/dl/import.rb (DL::Importer#sizeof): follows
+ a feature change in 1.9.
+
Sun Dec 28 19:11:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/Makefile.sub (config.h): do not use snprintf/vsnprintf in
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
index f6fb35944d..4f93468dd5 100644
--- a/ext/dl/lib/dl/import.rb
+++ b/ext/dl/lib/dl/import.rb
@@ -87,7 +87,7 @@ module DL
raise(DLError, "unknown type: #{ty}")
end
when Class
- if( ty.instance_methods().include?("to_ptr") )
+ if( ty.instance_methods().include?(:to_ptr) )
return ty.size()
end
end