diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-17 06:08:22 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-17 06:08:22 +0000 |
commit | 8676e7a9bcb2e41141b019941de85e6b1ad0b33d (patch) | |
tree | c06e5d5002c492c48f5aaf49936f857075f85ca6 | |
parent | f83fb0b4b2b2bba18cb07f0d395588f8bb8b5630 (diff) |
merge revision(s) 47590: [Backport #10241]
* ext/fiddle/lib/fiddle/import.rb (Fiddle::Importer#sizeof): fix typo,
SIZEOF_LONG_LON. [Fix GH-714]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/fiddle/lib/fiddle/import.rb | 2 | ||||
-rw-r--r-- | test/fiddle/test_import.rb | 9 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Sep 17 15:07:35 2014 Sho Hashimoto <sho.hsmt@gmail.com> + + * ext/fiddle/lib/fiddle/import.rb (Fiddle::Importer#sizeof): fix typo, + SIZEOF_LONG_LON. [Fix GH-714] + Wed Sep 17 14:58:50 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also diff --git a/ext/fiddle/lib/fiddle/import.rb b/ext/fiddle/lib/fiddle/import.rb index 8b948e8f23..ec5ee94dcf 100644 --- a/ext/fiddle/lib/fiddle/import.rb +++ b/ext/fiddle/lib/fiddle/import.rb @@ -112,7 +112,7 @@ module Fiddle when TYPE_LONG return SIZEOF_LONG when TYPE_LONG_LONG - return SIZEOF_LONG_LON + return SIZEOF_LONG_LONG when TYPE_FLOAT return SIZEOF_FLOAT when TYPE_DOUBLE diff --git a/test/fiddle/test_import.rb b/test/fiddle/test_import.rb index 62985cfcd3..d06477bfa5 100644 --- a/test/fiddle/test_import.rb +++ b/test/fiddle/test_import.rb @@ -65,6 +65,15 @@ module Fiddle assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct.malloc())) end + Fiddle.constants.grep(/\ATYPE_(?!VOID\z)(.*)/) do + type = $& + size = Fiddle.const_get("SIZEOF_#{$1}") + name = $1.sub(/P\z/,"*").gsub(/_(?!T\z)/, " ").downcase + define_method("test_sizeof_#{name}") do + assert_equal(size, Fiddle::Importer.sizeof(name), type) + end + end + def test_unsigned_result() d = (2 ** 31) + 1 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-09-17" -#define RUBY_PATCHLEVEL 572 +#define RUBY_PATCHLEVEL 573 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 9 |