ruby-changes:38975
From: nobu <ko1@a...>
Date: Mon, 29 Jun 2015 07:24:38 +0900 (JST)
Subject: [ruby-changes:38975] nobu:r51056 (trunk): sizes.c.tmpl: extract RUBY_DEFINT
nobu 2015-06-29 07:24:05 +0900 (Mon, 29 Jun 2015) New Revision: 51056 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51056 Log: sizes.c.tmpl: extract RUBY_DEFINT * 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. Modified files: trunk/ChangeLog trunk/ext/rbconfig/sizeof/extconf.rb trunk/template/sizes.c.tmpl Index: ChangeLog =================================================================== --- ChangeLog (revision 51055) +++ ChangeLog (revision 51056) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Mon Jun 29 07:23:55 2015 Nobuyoshi Nakada <nobu@r...> + + * 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@r...> * insns.def (defineclass): preserve encoding of name in error Index: ext/rbconfig/sizeof/extconf.rb =================================================================== --- ext/rbconfig/sizeof/extconf.rb (revision 51055) +++ ext/rbconfig/sizeof/extconf.rb (revision 51056) @@ -1,10 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ext/rbconfig/sizeof/extconf.rb#L1 $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') https://github.com/ruby/ruby/blob/trunk/ext/rbconfig/sizeof/extconf.rb#L9 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') Index: template/sizes.c.tmpl =================================================================== --- template/sizes.c.tmpl (revision 51055) +++ template/sizes.c.tmpl (revision 51056) @@ -7,6 +7,7 @@ class String https://github.com/ruby/ruby/blob/trunk/template/sizes.c.tmpl#L7 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)', -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/