diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-06 17:27:50 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-06 17:27:50 +0000 |
commit | c30f5e82a7330ec714d6fd7e3b3ff7b9212fcc0f (patch) | |
tree | 2ba7f56320c3a312047921f89794f23381f881a2 | |
parent | 254446f555a23a830d4b26972c1fdbad000d815b (diff) | |
download | ruby-c30f5e82a7330ec714d6fd7e3b3ff7b9212fcc0f.tar.gz |
* configure.in (RUBY_DEFINT): should pass includes to
AC_CHECK_SIZEOF and RUBY_CHECK_SIZEOF.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 9 |
2 files changed, 9 insertions, 5 deletions
@@ -1,4 +1,7 @@ -Tue Apr 7 02:25:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Apr 7 02:27:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (RUBY_DEFINT): should pass includes to + AC_CHECK_SIZEOF and RUBY_CHECK_SIZEOF. * configure.in (CFLAGS, CXXFLAGS): need ARCH_FLAG for universal binary. diff --git a/configure.in b/configure.in index 497fc7b716..7a7b4f6187 100644 --- a/configure.in +++ b/configure.in @@ -938,8 +938,8 @@ RUBY_CHECK_SIZEOF(rlim_t, [int long "long long"], [], [ ]) AC_TYPE_SIZE_T -RUBY_CHECK_SIZEOF(size_t, [int long void*]) -RUBY_CHECK_SIZEOF(ptrdiff_t, size_t) +RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>]) +RUBY_CHECK_SIZEOF(ptrdiff_t, size_t, [], [@%:@include <stddef.h>]) AC_STRUCT_ST_BLKSIZE AC_STRUCT_ST_BLOCKS AC_STRUCT_ST_RDEV @@ -981,7 +981,8 @@ typedef $1 t; int s = sizeof(t) == 42;])], if test "${rb_cv_type_$1}" != no; then AC_DEFINE([HAVE_]AS_TR_CPP($1), 1) if test "${rb_cv_type_$1}" = yes; then - m4_bmatch([$2], [^[1-9][0-9]*$], [AC_CHECK_SIZEOF($1)], [RUBY_CHECK_SIZEOF($1, $2)]) + m4_bmatch([$2], [^[1-9][0-9]*$], [AC_CHECK_SIZEOF([$1], 0, [$4])], + [RUBY_CHECK_SIZEOF([$1], [$2], [], [$4])]) else AC_DEFINE_UNQUOTED($1, [$rb_cv_type_$1]) AC_DEFINE_UNQUOTED([SIZEOF_]AS_TR_CPP($1), [SIZEOF_]AS_TR_CPP([$rb_cv_type_$1])) @@ -1001,7 +1002,7 @@ RUBY_DEFINT(int128_t, 16) RUBY_DEFINT(uint128_t, 16, unsigned) RUBY_DEFINT(intptr_t, void*) RUBY_DEFINT(uintptr_t, void*, unsigned) -RUBY_DEFINT(ssize_t, size_t) dnl may differ from int, so not use AC_TYPE_SSIZE_T. +RUBY_DEFINT(ssize_t, size_t, [], [@%:@include <sys/types.h>]) dnl may differ from int, so not use AC_TYPE_SSIZE_T. AC_CACHE_CHECK(for stack end address, rb_cv_stack_end_address, [rb_cv_stack_end_address=no |