diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-10 04:16:53 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-10 04:16:53 +0000 |
| commit | f8cc2fb9c1d85f05485d9d6d694d1983d59bbec0 (patch) | |
| tree | 7ce9ff2cf4b1655ffd74e7d8ef9ad9429f28f172 /configure.in | |
| parent | 12eb0df4d55e4ce1cd0cfafab72706accf9fa5ba (diff) | |
| download | ruby-f8cc2fb9c1d85f05485d9d6d694d1983d59bbec0.tar.gz | |
configure.in: unique names
* configure.in (RUBY_CHECK_SIZEOF): make variable names unique
with rbcv_sizeof_ prefix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/configure.in b/configure.in index dba9d4a097..437318199b 100644 --- a/configure.in +++ b/configure.in @@ -1394,6 +1394,12 @@ AC_CACHE_CHECK([char bit], [rb_cv_char_bit], dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include] AC_DEFUN([RUBY_CHECK_SIZEOF], +[dnl +AS_VAR_PUSHDEF([rbcv_var], [rbcv_sizeof_var])dnl +AS_VAR_PUSHDEF([cond], [rbcv_sizeof_cond])dnl +AS_VAR_PUSHDEF([t], [rbcv_sizeof_type])dnl +AS_VAR_PUSHDEF([s], [rbcv_sizeof_size])dnl +] [m4_bmatch([$1], [\.], [], [if test "$universal_binary" = yes; then]) AC_CACHE_CHECK([size of $1], [AS_TR_SH([ac_cv_sizeof_$1])], [ unset AS_TR_SH(ac_cv_sizeof_$1) @@ -1427,8 +1433,8 @@ static ac__type_sizeof_ *rbcv_ptr; AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr], [!AS_TR_CPP(HAVE_$1)])], [continue]) AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr] [$rbcv_var], - [AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == ([$[s / rb_cv_char_bit]]))])], - [AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}${s}"]) + [AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == ($s / $rb_cv_char_bit))])], + [AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}${s}"; continue]) done done }]) @@ -1456,13 +1462,14 @@ ${cond+@%:@endif} AS_CASE(["$t"], [[[0-9]*|SIZEOF_*]], [ ${cond+echo "@%:@else"} - echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) [$t]" + echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) $t" break ], [ s=`expr $t : ['.*[^0-9]\([0-9][0-9]*\)$']` + s=`expr $s / $rb_cv_char_bit` echo "@%:@${cond+el}if defined(__${t}__) || defined(__${t}) || defined(_${t}) || defined($t)" - echo "@%:@define AS_TR_CPP(SIZEOF_$1) [$[s / rb_cv_char_bit]]" + echo "@%:@define AS_TR_CPP(SIZEOF_$1) $s" cond=1 ]) done @@ -1471,6 +1478,10 @@ ${cond+@%:@endif} m4_bmatch([$1], [\.], [], [else AC_CHECK_SIZEOF([$1], 0, [$4]) fi]) +AS_VAR_POPDEF([rbcv_var])dnl +AS_VAR_POPDEF([cond])dnl +AS_VAR_POPDEF([t])dnl +AS_VAR_POPDEF([s])dnl ]) RUBY_CHECK_SIZEOF(int, [], [ILP]) |