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

configure.in: unique names

Browse source 
* 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
This commit is contained in:
nobu 2016-02-10 04:16:53 +00:00
parent 12eb0df4d5
commit f8cc2fb9c1
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
configure.in
View file

@ -1394,6 +1394,12 @@ AC_CACHE_CHECK([char bit], [rb_cv_char_bit],
dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include] dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include]
AC_DEFUN([RUBY_CHECK_SIZEOF], 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]) [m4_bmatch([$1], [\.], [], [if test "$universal_binary" = yes; then])
AC_CACHE_CHECK([size of $1], [AS_TR_SH([ac_cv_sizeof_$1])], [ AC_CACHE_CHECK([size of $1], [AS_TR_SH([ac_cv_sizeof_$1])], [
unset 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], [!AS_TR_CPP(HAVE_$1)])], [continue])
AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr] AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr]
[$rbcv_var], [$rbcv_var],
[AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == ([$[s / rb_cv_char_bit]]))])], [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_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}${s}"; continue])
done done
done done
}]) }])
@ -1456,13 +1462,14 @@ ${cond+@%:@endif}
AS_CASE(["$t"], AS_CASE(["$t"],
[[[0-9]*|SIZEOF_*]], [ [[[0-9]*|SIZEOF_*]], [
${cond+echo "@%:@else"} ${cond+echo "@%:@else"}
echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) [$t]" echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) $t"
break break
], ],
[ [
s=`expr $t : ['.*[^0-9]\([0-9][0-9]*\)$']` 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 "@%:@${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 cond=1
]) ])
done done
@ -1471,6 +1478,10 @@ ${cond+@%:@endif}
m4_bmatch([$1], [\.], [], [else m4_bmatch([$1], [\.], [], [else
AC_CHECK_SIZEOF([$1], 0, [$4]) AC_CHECK_SIZEOF([$1], 0, [$4])
fi]) 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]) RUBY_CHECK_SIZEOF(int, [], [ILP])