aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ext/fiddle/lib/fiddle/import.rb2
-rw-r--r--test/fiddle/test_import.rb1
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f1f9bf7820..bb97cdf196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Dec 21 22:43:36 2012 Kouhei Sutou <kou@cozmixng.org>
+
+ * ext/fiddle/lib/fiddle/import.rb (Fiddle::Importer#sizeof):
+ CPtr -> Pointer.
+ * test/fiddle/test_import.rb (Fiddle::TestImport#test_sizeof):
+ Added the test for the above.
+
Fri Dec 21 22:34:17 2012 Koichi Sasada <ko1@atdot.net>
* test/ruby/test_iseq.rb: disable a test which checks features
diff --git a/ext/fiddle/lib/fiddle/import.rb b/ext/fiddle/lib/fiddle/import.rb
index 75853d6def..8b948e8f23 100644
--- a/ext/fiddle/lib/fiddle/import.rb
+++ b/ext/fiddle/lib/fiddle/import.rb
@@ -127,7 +127,7 @@ module Fiddle
return ty.size()
end
end
- return CPtr[ty].size()
+ return Pointer[ty].size()
end
def parse_bind_options(opts)
diff --git a/test/fiddle/test_import.rb b/test/fiddle/test_import.rb
index a2e31abf0b..d792eaf657 100644
--- a/test/fiddle/test_import.rb
+++ b/test/fiddle/test_import.rb
@@ -59,6 +59,7 @@ module Fiddle
def test_sizeof()
assert_equal(SIZEOF_VOIDP, LIBC.sizeof("FILE*"))
assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct))
+ assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct.malloc()))
end
def test_unsigned_result()