diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 13 | ||||
| -rw-r--r-- | test/mkmf/test_constant.rb | 15 |
3 files changed, 29 insertions, 3 deletions
@@ -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. TODO: define check_constant and use it. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 7f7d13627f..900006ec11 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -646,8 +646,17 @@ SRC src = %{#{includes} #include <stdio.h> /*top*/ -int conftest_const = (int)(#{const}); -int main() {printf("%d\\n", conftest_const); return 0;} +typedef +#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 if try_link0(src, opt, &b) diff --git a/test/mkmf/test_constant.rb b/test/mkmf/test_constant.rb index bf5ff8c3f1..6628f7f0bc 100644 --- a/test/mkmf/test_constant.rb +++ b/test/mkmf/test_constant.rb @@ -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_VALUE").to_i, mkmf {try_constant("sizeof(Qnil)")}, MKMFLOG) 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 |