diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.in | 7 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Tue Oct 7 10:48:17 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (struct stat.st_size): prefer off_t over int, long, + and so on. inspired by + http://www.opensource.apple.com/source/ruby/ruby-104/patches/config.h.ed + Tue Oct 7 10:37:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (RUBY_UNIVERSAL_ARCH): fix missing quoting diff --git a/configure.in b/configure.in index 37e176e5fb..19c3f56fae 100644 --- a/configure.in +++ b/configure.in @@ -1705,10 +1705,11 @@ RUBY_CHECK_PRINTF_PREFIX(ptrdiff_t, t) AC_STRUCT_ST_BLKSIZE AC_STRUCT_ST_BLOCKS AC_STRUCT_ST_RDEV -RUBY_CHECK_SIZEOF([struct stat.st_size], [int long "long long"], [], [@%:@include <sys/stat.h>]) +RUBY_CHECK_SIZEOF([struct stat.st_size], [off_t int long "long long"], [], [@%:@include <sys/stat.h>]) if test "$ac_cv_member_struct_stat_st_blocks" = yes; then - RUBY_CHECK_SIZEOF([struct stat.st_blocks], [int long "long long"], [], [@%:@include <sys/stat.h>]) + RUBY_CHECK_SIZEOF([struct stat.st_blocks], [off_t int long "long long"], [], [@%:@include <sys/stat.h>]) fi +RUBY_CHECK_SIZEOF([struct stat.st_ino], [long "long long"], [], [@%:@include <sys/stat.h>]) AC_CHECK_MEMBERS([struct stat.st_atim]) AC_CHECK_MEMBERS([struct stat.st_atimespec]) AC_CHECK_MEMBERS([struct stat.st_atimensec]) @@ -2506,8 +2507,6 @@ if test x"$ac_cv_func_gettimeofday" != xyes; then AC_MSG_ERROR(gettimeofday() must exist) fi -RUBY_CHECK_SIZEOF([struct stat.st_ino], [long "long long"], [], [@%:@include <sys/stat.h>]) - if test "$ac_cv_func_sysconf" = yes; then AC_DEFUN([RUBY_CHECK_SYSCONF], [dnl AC_CACHE_CHECK([whether _SC_$1 is supported], rb_cv_have_sc_[]m4_tolower($1), |