summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-08 08:38:38 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-08 08:38:38 +0000
commitbd7d6742f90a977493960565ae5da26d60fb894b (patch)
treed6d9b83dce4e56b3523520a02a0e726e45540b1b
parentdce64c404c9497c8e02145eaac6168849e62e1a4 (diff)
* merge -c 11972
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--eval.c2
-rw-r--r--version.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fdc6db9..f141f91 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 6eab561..991792c 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 4a532a1..d72557f 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