diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-24 10:23:45 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-24 10:23:45 +0000 |
commit | a1b3e45534d357116209e5b91d59034a8ddbe72f (patch) | |
tree | 0257319288b4f32f728f3c1aa0b705037cebde45 | |
parent | 01c64b1aca49476bc3161077dbc2a1fcf211cfae (diff) | |
download | ruby-a1b3e45534d357116209e5b91d59034a8ddbe72f.tar.gz ruby-a1b3e45534d357116209e5b91d59034a8ddbe72f.tar.xz ruby-a1b3e45534d357116209e5b91d59034a8ddbe72f.zip |
* configure.in (RUBY_CHECK_SIZEOF): need to include $4.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.in | 7 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Tue Mar 24 19:23:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (RUBY_CHECK_SIZEOF): need to include $4. + Tue Mar 24 17:08:52 2009 Akinori MUSHA <knu@iDaemons.org> * io.c (rb_io_inspect): Cannot access fptr->fd if fptr is NULL. diff --git a/configure.in b/configure.in index 2320703b4..f12bd30c0 100644 --- a/configure.in +++ b/configure.in @@ -370,7 +370,8 @@ static ac__type_sizeof_ *rbcv_ptr; m4_ifval([$2], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && { for t in $2; do AC_COMPILE_IFELSE( - [AC_LANG_BOOL_COMPILE_TRY(AC_INCLUDES_DEFAULT([$rbcv_var]), + [AC_LANG_BOOL_COMPILE_TRY(AC_INCLUDES_DEFAULT([$4] + [$rbcv_var]), [AS_TR_CPP(SIZEOF_$1) == sizeof($t)])], [ AS_TR_SH(ac_cv_sizeof_$1)=AS_TR_CPP([SIZEOF_]$t) break]) @@ -382,7 +383,7 @@ static ac__type_sizeof_ *rbcv_ptr; for t in $3; do cond="${cond} @%:@${cond+el}if defined(__${t}${s}__) || defined(__${t}${s}) || defined(_${t}${s}) || defined(${t}${s})" - hdr="AC_INCLUDES_DEFAULT([ + hdr="AC_INCLUDES_DEFAULT([$4 @%:@if defined(__${t}${s}__) || defined(__${t}${s}) || defined(_${t}${s}) || defined(${t}${s}) @%:@ define AS_TR_CPP(HAVE_$1) 1 @%:@else @@ -446,7 +447,7 @@ RUBY_CHECK_SIZEOF(off_t) RUBY_CHECK_SIZEOF(void*, [int long "long long"], [ILP LP LLP]) RUBY_CHECK_SIZEOF(float) RUBY_CHECK_SIZEOF(double) -RUBY_CHECK_SIZEOF(time_t, [long "long long"]) +RUBY_CHECK_SIZEOF(time_t, [long "long long"], [], [@%:@include <time.h>]) dnl RUBY_REPLACE_TYPE [typename] [default type] [macro type] [included] AC_DEFUN([RUBY_REPLACE_TYPE], [dnl |