From b0416f342a2b2f43a17189fdbb24e53cef08e4ba Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 18 Feb 2011 10:43:45 +0000 Subject: merges r30699 and r30700 from trunk into ruby_1_9_2. -- * configure.in: Add #include 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 --- ChangeLog | 5 +++++ configure.in | 4 ++-- version.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5f7c347a5..6bb9fb2b5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 28 12:05:48 2011 KOSAKI Motohiro + + * configure.in: Add #include when struct stat is + tested. Otherwise, incomplete type dereference error will occur. + Fri Jan 28 02:37:18 2011 KOSAKI Motohiro * 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 ]) 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 ]) 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 ]) fi AC_CHECK_MEMBERS([struct stat.st_atim]) AC_CHECK_MEMBERS([struct stat.st_atimespec]) diff --git a/version.h b/version.h index b8530b7881..ad029f603d 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3