akr	2009-02-28 20:12:36 +0900 (Sat, 28 Feb 2009)

  New Revision: 22677

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22677

  Log:
    * eval_error.c (error_print): use volatile to suppress warnings.
    * vm_eval.c (eval_string_with_cref): ditto.
    
    * thread.c (rb_exec_recursive): ditto.
    
    * eval_jump.c (rb_exec_end_proc): ditto.
    
    * eval.c (ruby_exec_node): ditto.
      (rb_longjmp): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/eval.c
    trunk/eval_error.c
    trunk/eval_jump.c
    trunk/thread.c
    trunk/vm_eval.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22676)
+++ ChangeLog	(revision 22677)
@@ -1,3 +1,16 @@
+Sat Feb 28 20:09:40 2009  Tanaka Akira  <akr@f...>
+
+	* eval_error.c (error_print): use volatile to suppress warnings.
+
+	* vm_eval.c (eval_string_with_cref): ditto.
+
+	* thread.c (rb_exec_recursive): ditto.
+
+	* eval_jump.c (rb_exec_end_proc): ditto.
+
+	* eval.c (ruby_exec_node): ditto.
+	  (rb_longjmp): ditto.
+
 Sat Feb 28 18:28:58 2009  Tanaka Akira  <akr@f...>
 
 	* ext/socket/ancdata.c (ancillary_unix_rights): check message type.
Index: eval_error.c
===================================================================
--- eval_error.c	(revision 22676)
+++ eval_error.c	(revision 22677)
@@ -66,11 +66,11 @@
 static void
 error_print(void)
 {
-    VALUE errat = Qnil;		/* OK */
+    volatile VALUE errat = Qnil;		/* OK */
     VALUE errinfo = GET_THREAD()->errinfo;
     volatile VALUE eclass, e;
-    const char *einfo;
-    long elen;
+    const char *volatile einfo;
+    volatile long elen;
 
     if (NIL_P(errinfo))
 	return;
Index: vm_eval.c
===================================================================
--- vm_eval.c	(revision 22676)
+++ vm_eval.c	(revision 22677)
@@ -688,7 +688,7 @@
 }
 
 static VALUE
-eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char *file, int line)
+eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char *volatile file, volatile int line)
 {
     int state;
     VALUE result = Qundef;
Index: thread.c
===================================================================
--- thread.c	(revision 22676)
+++ thread.c	(revision 22677)
@@ -3345,7 +3345,7 @@
 VALUE
 rb_exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE arg)
 {
-    VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key);
+    volatile VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key);
     VALUE objid = rb_obj_id(obj);
 
     if (recursive_check(hash, objid)) {
Index: eval_jump.c
===================================================================
--- eval_jump.c	(revision 22676)
+++ eval_jump.c	(revision 22677)
@@ -101,7 +101,8 @@
 void
 rb_exec_end_proc(void)
 {
-    struct end_proc_data *link, *tmp;
+    struct end_proc_data *volatile link;
+    struct end_proc_data *tmp;
     int status;
     volatile int safe = rb_safe_level();
 
Index: eval.c
===================================================================
--- eval.c	(revision 22676)
+++ eval.c	(revision 22677)
@@ -193,7 +193,7 @@
 int
 ruby_exec_node(void *n, const char *file)
 {
-    int state;
+    volatile int state;
     VALUE iseq = (VALUE)n;
     rb_thread_t *th = GET_THREAD();
 
@@ -332,13 +332,13 @@
 NORETURN(static void rb_longjmp(int, VALUE));
 
 static void
-rb_longjmp(int tag, VALUE mesg)
+rb_longjmp(int tag, volatile VALUE mesg)
 {
     VALUE at;
     VALUE e;
     rb_thread_t *th = GET_THREAD();
     const char *file;
-    int line = 0;
+    volatile int line = 0;
 
     if (rb_thread_set_raised(th)) {
 	th->errinfo = exception_error;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/