* merge -c 11972

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index fdc6db9b6b..f141f91fdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Mar  3 21:41:31 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* eval.c (stack_check): Unset inline to fix build with GCC 3.4.6;
+	  submitted by: NISHIMATSU Takeshi <t_nissie AT yahoo.co.jp> in
+	  [ruby-list:43218].
+	  cf. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24556
+
 Sat Mar  3 16:30:39 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* env.h (SCOPE_CLONE): Introduce a new scope flag to prevent a
diff --git a/eval.c b/eval.c
index 6eab561c2b..991792c875 100644
--- a/eval.c
+++ b/eval.c
@@ -5485,7 +5485,7 @@ rb_with_disable_interrupt(proc, data)
     return result;
 }
 
-static inline void
+static void
 stack_check()
 {
     static int overflowing = 0;
diff --git a/version.h b/version.h
index 4a532a1c64..d72557fe66 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-03-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20070308
-#define RUBY_PATCHLEVEL 26
+#define RUBY_PATCHLEVEL 27
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8