kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) r47590: [Backport #10241]

Browse source 
* 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_1@47595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-09-15 13:33:17 +00:00
parent d67632d206
commit eba7b76c4c
4 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Sep 15 22:31:33 2014 Sho Hashimoto <sho.hsmt@gmail.com>
* ext/fiddle/lib/fiddle/import.rb (Fiddle::Importer#sizeof): fix typo,
SIZEOF_LONG_LON. [Fix GH-714]
Mon Sep 15 11:08:23 2014 Shota Fukumori <her@sorah.jp> Mon Sep 15 11:08:23 2014 Shota Fukumori <her@sorah.jp>
* lib/mkmf.rb (configuration): Make CXXFLAGS customizable. * lib/mkmf.rb (configuration): Make CXXFLAGS customizable.

2
ext/fiddle/lib/fiddle/import.rb
View file

@ -112,7 +112,7 @@ module Fiddle
when TYPE_LONG when TYPE_LONG
return SIZEOF_LONG return SIZEOF_LONG
when TYPE_LONG_LONG when TYPE_LONG_LONG
return SIZEOF_LONG_LON return SIZEOF_LONG_LONG
when TYPE_FLOAT when TYPE_FLOAT
return SIZEOF_FLOAT return SIZEOF_FLOAT
when TYPE_DOUBLE when TYPE_DOUBLE

9
test/fiddle/test_import.rb
View file

@ -65,6 +65,15 @@ module Fiddle
assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct.malloc())) assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct.malloc()))
end 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() def test_unsigned_result()
d = (2 ** 31) + 1 d = (2 ** 31) + 1

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.2" #define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-09-15" #define RUBY_RELEASE_DATE "2014-09-15"
#define RUBY_PATCHLEVEL 238 #define RUBY_PATCHLEVEL 239
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 9 #define RUBY_RELEASE_MONTH 9