diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/rbconfig/sizeof/extconf.rb | 5 | ||||
| -rw-r--r-- | template/sizes.c.tmpl | 1 |
3 files changed, 7 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Mon Jun 29 07:23:55 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * template/sizes.c.tmpl: extract RUBY_DEFINT to define sizes of + types checked by configure.in, and fix size of intptr_t in + universal binary. + Mon Jun 29 02:10:10 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * insns.def (defineclass): preserve encoding of name in error diff --git a/ext/rbconfig/sizeof/extconf.rb b/ext/rbconfig/sizeof/extconf.rb index efbdeb7d6a..695f13a5ff 100644 --- a/ext/rbconfig/sizeof/extconf.rb +++ b/ext/rbconfig/sizeof/extconf.rb @@ -1,10 +1,6 @@ $srcs = %w[sizes.c] $distcleanfiles.concat($srcs) -check_sizeof('int8_t') -check_sizeof('int16_t') -check_sizeof('int32_t') -check_sizeof('int64_t') check_sizeof('int_least8_t') check_sizeof('int_least16_t') check_sizeof('int_least32_t') @@ -13,7 +9,6 @@ check_sizeof('int_fast8_t') check_sizeof('int_fast16_t') check_sizeof('int_fast32_t') check_sizeof('int_fast64_t') -check_sizeof('intptr_t') check_sizeof('intmax_t') check_sizeof('sig_atomic_t', %w[signal.h]) check_sizeof('wchar_t') diff --git a/template/sizes.c.tmpl b/template/sizes.c.tmpl index 146e209db7..da061ce509 100644 --- a/template/sizes.c.tmpl +++ b/template/sizes.c.tmpl @@ -7,6 +7,7 @@ class String end end types = ARGF.grep(/^\s*RUBY_CHECK_SIZEOF\((\w[^\[\],#]*)[^#]*\)| + ^\s*RUBY_DEFINT\((\w[^\[\],#]*)[^#]*\)| ^\s*check_sizeof\('(.+?)'/x) {$+} conditions = { "long long" => 'defined(HAVE_TRUE_LONG_LONG)', |