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

mkmf.rb: larger constants

Browse source 
* lib/mkmf.rb (MakeMakefile#try_constant): fix for larger constants.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-01-23 07:18:01 +00:00
parent e8c229510e
commit 5d223fabb7
3 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,4 +1,6 @@
Wed Jan 23 16:16:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jan 23 16:17:59 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (MakeMakefile#try_constant): fix for larger constants.
* test/mkmf/test_constant.rb: tests for try_constant. * test/mkmf/test_constant.rb: tests for try_constant.
TODO: define check_constant and use it. TODO: define check_constant and use it.

13
lib/mkmf.rb
View file

@ -646,8 +646,17 @@ SRC
src = %{#{includes} src = %{#{includes}
#include <stdio.h> #include <stdio.h>
/*top*/ /*top*/
int conftest_const = (int)(#{const}); typedef
int main() {printf("%d\\n", conftest_const); return 0;} #ifdef PRI_LL_PREFIX
#define PRI_CONFTEST_PREFIX PRI_LL_PREFIX
LONG_LONG
#else
#define PRI_CONFTEST_PREFIX "l"
long
#endif
conftest_type;
conftest_type conftest_const = (conftest_type)(#{const});
int main() {printf("%"PRI_CONFTEST_PREFIX"d\\n", conftest_const); return 0;}
} }
begin begin
if try_link0(src, opt, &b) if try_link0(src, opt, &b)

15
test/mkmf/test_constant.rb
View file

@ -14,5 +14,20 @@ class TestMkmf
assert_equal(config_value("SIZEOF_VOIDP").to_i, mkmf {try_constant("sizeof(void*)")}, MKMFLOG) assert_equal(config_value("SIZEOF_VOIDP").to_i, mkmf {try_constant("sizeof(void*)")}, MKMFLOG)
assert_equal(config_value("SIZEOF_VALUE").to_i, mkmf {try_constant("sizeof(Qnil)")}, MKMFLOG) assert_equal(config_value("SIZEOF_VALUE").to_i, mkmf {try_constant("sizeof(Qnil)")}, MKMFLOG)
end end
def test_long
sizeof_int = config_value("SIZEOF_INT").to_i
sizeof_long = config_value("SIZEOF_LONG").to_i
if sizeof_long > sizeof_int
type = 'long'
else
sizeof_long_long = config_value("SIZEOF_LONG_LONG").to_i
return if !sizeof_long_long or sizeof_long_long <= sizeof_int
type = 'LONG_LONG'
end
decl = "#define CONFTEST_VALUE (unsigned #{type})(((unsigned #{type})1)<<(CHAR_BIT*sizeof(int)))"
assert_operator(mkmf {try_constant("CONFTEST_VALUE", [[decl]])}, :>, 0, MKMFLOG)
end
end end
end end