diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-18 10:43:45 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-18 10:43:45 +0000 |
commit | b0416f342a2b2f43a17189fdbb24e53cef08e4ba (patch) | |
tree | a14772aca54b2ea53e12a3d382012ce9d4bb76eb | |
parent | b5296022863787b9bc9ce161cf1e02d381d0b722 (diff) | |
download | ruby-b0416f342a2b2f43a17189fdbb24e53cef08e4ba.tar.gz |
merges r30699 and r30700 from trunk into ruby_1_9_2.
--
* configure.in: Add #include<sys/stat.h> when struct stat is
tested. Otherwise, incomplete type dereference error will occur.
--
We don't only need to change "struct stat.st_size" test, but also
need to change "struct stat.st_blocks" test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Fri Jan 28 12:05:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * configure.in: Add #include<sys/stat.h> when struct stat is + tested. Otherwise, incomplete type dereference error will occur. + Fri Jan 28 02:37:18 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * re.c (rb_reg_raise): add GC guard to prevent intermediate diff --git a/configure.in b/configure.in index b08b33a6b8..7fba909f9d 100644 --- a/configure.in +++ b/configure.in @@ -1044,9 +1044,9 @@ RUBY_CHECK_SIZEOF(ptrdiff_t, size_t, [], [@%:@include <stddef.h>]) AC_STRUCT_ST_BLKSIZE AC_STRUCT_ST_BLOCKS AC_STRUCT_ST_RDEV -RUBY_CHECK_SIZEOF([struct stat.st_size], [int long "long long"]) +RUBY_CHECK_SIZEOF([struct stat.st_size], [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"]) + RUBY_CHECK_SIZEOF([struct stat.st_blocks], [int long "long long"], [], [@%:@include <sys/stat.h>]) fi AC_CHECK_MEMBERS([struct stat.st_atim]) AC_CHECK_MEMBERS([struct stat.st_atimespec]) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 177 +#define RUBY_PATCHLEVEL 178 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |