From 2e5e8fd89540bc4301e6a94df022c41b44eca31a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 22 Oct 2009 22:28:52 +0000
Subject: [PATCH] * configure.in (warnflags): use -Wextra instead of -Wall.

* gc.c (mark_current_machine_context): get rid of warning.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 6 ++++++
 configure.in | 2 +-
 gc.c         | 7 ++++---
 version.h    | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 421890caa0..4c4191fd33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 23 07:28:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (warnflags): use -Wextra instead of -Wall.
+
+	* gc.c (mark_current_machine_context): get rid of warning.
+
 Thu Oct 22 21:10:39 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* class.c (rb_obj_basic_to_s_p): typo.  Please become familiar with
diff --git a/configure.in b/configure.in
index 3b6d2bb111..7f7a649c97 100644
--- a/configure.in
+++ b/configure.in
@@ -389,7 +389,7 @@ dnl compiler section {
 
 if test "$GCC:${warnflags+set}:no" = yes::no; then
     save_CFLAGS="$CFLAGS"
-    for wflag in -Wall -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings \
+    for wflag in -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings \
 		 -Wno-missing-field-initializers -Wshorten-64-to-32; do
         CFLAGS="$CFLAGS $wflag"
         AC_MSG_CHECKING([whether $wflag is accepted])
diff --git a/gc.c b/gc.c
index 0effc43894..ddfe39bf3b 100644
--- a/gc.c
+++ b/gc.c
@@ -2094,6 +2094,10 @@ mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
     rb_jmp_buf save_regs_gc_mark;
     VALUE *stack_start, *stack_end;
 
+    FLUSH_REGISTER_WINDOWS;
+    /* This assumes that all registers are saved into the jmp_buf (and stack) */
+    rb_setjmp(save_regs_gc_mark);
+
     SET_STACK_END;
 #if STACK_GROW_DIRECTION < 0
     stack_start = th->machine_stack_end;
@@ -2112,9 +2116,6 @@ mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
     }
 #endif
 
-    FLUSH_REGISTER_WINDOWS;
-    /* This assumes that all registers are saved into the jmp_buf (and stack) */
-    rb_setjmp(save_regs_gc_mark);
     mark_locations_array(objspace,
 			 (VALUE*)save_regs_gc_mark,
 			 sizeof(save_regs_gc_mark) / sizeof(VALUE));
diff --git a/version.h b/version.h
index 788a453ae1..1888fd1d53 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-10-22"
+#define RUBY_RELEASE_DATE "2009-10-23"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 23
 
 #include "ruby/version.h"