[ruby-dev:12564] [PATCH] suppress warnings at compiling

早坂@北陸先端です.

compile 時に rb_gc_mark() の引数で warning が出ます.

eval.c:5740: warning: passing arg 1 of `rb_gc_mark' makes pointer
from integer without a cast

明示的に cast してやれば出なくなります.

diff -ru ruby.orig/eval.c ruby/eval.c
--- ruby.orig/eval.c    Mon Mar 19 17:07:49 2001
+++ ruby/eval.c Sun Mar 18 19:23:54 2001
@@ -5737,12 +5737,12 @@
 
     link = end_procs;
     while (link) {
-       rb_gc_mark(link->data);
+       rb_gc_mark((void *)link->data);
        link = link->next;
     }
     link = ephemeral_end_procs;
     while (link) {
-       rb_gc_mark(link->data);
+       rb_gc_mark((void *)link->data);
        link = link->next;
     }
 }
@@ -5956,13 +5956,13 @@
 {
     while (data) {
        rb_gc_mark_frame(&data->frame);
-       rb_gc_mark(data->scope);
-       rb_gc_mark(data->var);
-       rb_gc_mark(data->body);
-       rb_gc_mark(data->self);
-       rb_gc_mark(data->dyna_vars);
-       rb_gc_mark(data->klass);
-       rb_gc_mark(data->tag);
+       rb_gc_mark((void *)data->scope);
+       rb_gc_mark((void *)data->var);
+       rb_gc_mark((void *)data->body);
+       rb_gc_mark((void *)data->self);
+       rb_gc_mark((void *)data->dyna_vars);
+       rb_gc_mark((void *)data->klass);
+       rb_gc_mark((void *)data->tag);
        data = data->prev;
     }
 }
@@ -6453,10 +6453,10 @@
 bm_mark(data)
     struct METHOD *data;
 {
-    rb_gc_mark(data->oklass);
-    rb_gc_mark(data->klass);
-    rb_gc_mark(data->recv);
-    rb_gc_mark(data->body);
+    rb_gc_mark((void *)data->oklass);
+    rb_gc_mark((void *)data->klass);
+    rb_gc_mark((void *)data->recv);
+    rb_gc_mark((void *)data->body);
 }
 
 static VALUE
@@ -6909,18 +6909,18 @@
     struct FRAME *frame;
     struct BLOCK *block;
 
-    rb_gc_mark(th->result);
-    rb_gc_mark(th->thread);
-    if (th->join) rb_gc_mark(th->join->thread);
-
-    rb_gc_mark(th->klass);
-    rb_gc_mark(th->wrapper);
-
-    rb_gc_mark(th->scope);
-    rb_gc_mark(th->dyna_vars);
-    rb_gc_mark(th->errinfo);
-    rb_gc_mark(th->last_line);
-    rb_gc_mark(th->last_match);
+    rb_gc_mark((void *)th->result);
+    rb_gc_mark((void *)th->thread);
+    if (th->join) rb_gc_mark((void *)th->join->thread);
+
+    rb_gc_mark((void *)th->klass);
+    rb_gc_mark((void *)th->wrapper);
+
+    rb_gc_mark((void *)th->scope);
+    rb_gc_mark((void *)th->dyna_vars);
+    rb_gc_mark((void *)th->errinfo);
+    rb_gc_mark((void *)th->last_line);
+    rb_gc_mark((void *)th->last_match);
     rb_mark_tbl(th->locals);
 
     /* mark data in copied stack */
@@ -6963,7 +6963,7 @@
 
     if (!curr_thread) return;
     FOREACH_THREAD(th) {
-       rb_gc_mark(th->thread);
+       rb_gc_mark((void *)th->thread);
     } END_FOREACH(th);
 }
 
diff -ru ruby.orig/gc.c ruby/gc.c
--- ruby.orig/gc.c      Mon Mar 19 17:07:49 2001
+++ ruby/gc.c   Sun Mar 18 19:26:41 2001
@@ -361,7 +361,7 @@
 {
     while (n--) {
        if (is_pointer_to_heap(*x)) {
-           rb_gc_mark(*x);
+           rb_gc_mark((void *)*x);
        }
        x++;
     }
@@ -388,7 +388,7 @@
     ID key;
     VALUE value;
 {
-    rb_gc_mark(value);
+    rb_gc_mark((void *)value);
     return ST_CONTINUE;
 }
 
@@ -405,8 +405,8 @@
     VALUE key;
     VALUE value;
 {
-    rb_gc_mark(key);
-    rb_gc_mark(value);
+    rb_gc_mark((void *)key);
+    rb_gc_mark((void *)value);
     return ST_CONTINUE;
 }
 
@@ -423,7 +423,7 @@
     void *obj;
 {
     if (is_pointer_to_heap(obj)) {
-       rb_gc_mark(obj);
+       rb_gc_mark((void *)obj);
     }
 }
 
@@ -460,7 +460,7 @@
          case NODE_MASGN:
          case NODE_RESCUE:
          case NODE_RESBODY:
-           rb_gc_mark(obj->as.node.u2.node);
+           rb_gc_mark((void *)obj->as.node.u2.node);
            /* fall through */
          case NODE_BLOCK:      /* 1,3 */
          case NODE_ARRAY:
@@ -474,7 +474,7 @@
          case NODE_CALL:
          case NODE_DEFS:
          case NODE_OP_ASGN1:
-           rb_gc_mark(obj->as.node.u1.node);
+           rb_gc_mark((void *)obj->as.node.u1.node);
            /* fall through */
          case NODE_SUPER:      /* 3 */
          case NODE_FCALL:
@@ -497,7 +497,7 @@
          case NODE_MATCH3:
          case NODE_OP_ASGN_OR:
          case NODE_OP_ASGN_AND:
-           rb_gc_mark(obj->as.node.u1.node);
+           rb_gc_mark((void *)obj->as.node.u1.node);
            /* fall through */
          case NODE_METHOD:     /* 2 */
          case NODE_NOT:
@@ -531,7 +531,7 @@
          case NODE_SCOPE:      /* 2,3 */
          case NODE_CLASS:
          case NODE_BLOCK_PASS:
-           rb_gc_mark(obj->as.node.u3.node);
+           rb_gc_mark((void *)obj->as.node.u3.node);
            obj = RANY(obj->as.node.u2.node);
            goto Top;
 
@@ -572,10 +572,10 @@
 
          default:
            if (is_pointer_to_heap(obj->as.node.u1.node)) {
-               rb_gc_mark(obj->as.node.u1.node);
+               rb_gc_mark((void *)obj->as.node.u1.node);
            }
            if (is_pointer_to_heap(obj->as.node.u2.node)) {
-               rb_gc_mark(obj->as.node.u2.node);
+               rb_gc_mark((void *)obj->as.node.u2.node);
            }
            if (is_pointer_to_heap(obj->as.node.u3.node)) {
                obj = RANY(obj->as.node.u3.node);
@@ -585,12 +585,12 @@
        return;                 /* no need to mark class. */
     }
 
-    rb_gc_mark(obj->as.basic.klass);
+    rb_gc_mark((void *)obj->as.basic.klass);
     switch (obj->as.basic.flags & T_MASK) {
       case T_ICLASS:
       case T_CLASS:
       case T_MODULE:
-       rb_gc_mark(obj->as.klass.super);
+       rb_gc_mark((void *)obj->as.klass.super);
        rb_mark_tbl(obj->as.klass.m_tbl);
        rb_mark_tbl(obj->as.klass.iv_tbl);
        break;
@@ -601,13 +601,13 @@
            VALUE *ptr = obj->as.array.ptr;
 
            for (i=0; i < len; i++)
-               rb_gc_mark(*ptr++);
+               rb_gc_mark((void *)*ptr++);
        }
        break;
 
       case T_HASH:
        rb_mark_hash(obj->as.hash.tbl);
-       rb_gc_mark(obj->as.hash.ifnone);
+       rb_gc_mark((void *)obj->as.hash.ifnone);
        break;
 
       case T_STRING:
@@ -640,7 +640,7 @@
        break;
 
       case T_VARMAP:
-       rb_gc_mark(obj->as.varmap.val);
+       rb_gc_mark((void *)obj->as.varmap.val);
        obj = RANY(obj->as.varmap.next);
        goto Top;
        break;
@@ -651,7 +651,7 @@
            VALUE *vars = &obj->as.scope.local_vars[-1];
 
            while (n--) {
-               rb_gc_mark(*vars);
+               rb_gc_mark((void *)*vars);
                vars++;
            }
        }
@@ -663,7 +663,7 @@
            VALUE *ptr = obj->as.rstruct.ptr;
 
            for (i=0; i < len; i++)
-               rb_gc_mark(*ptr++);
+               rb_gc_mark((void *)*ptr++);
        }
        break;
 
@@ -689,7 +689,7 @@
            p = heaps[i]; pend = p + HEAP_SLOTS;
            while (p < pend) {
                if (!(p->as.basic.flags&FL_MARK) && BUILTIN_TYPE(p) == T_NODE)
-                   rb_gc_mark(p);
+                   rb_gc_mark((void *)p);
                p++;
            }
        }
@@ -897,7 +897,7 @@
     struct FRAME *frame;
 {
     mark_locations_array(frame->argv, frame->argc);
-    rb_gc_mark(frame->cbase);
+    rb_gc_mark((void *)frame->cbase);
 }
 
 #ifdef __GNUC__
@@ -981,9 +981,9 @@
            }
        }
     }
-    rb_gc_mark(ruby_class);
-    rb_gc_mark(ruby_scope);
-    rb_gc_mark(ruby_dyna_vars);
+    rb_gc_mark((void *)ruby_class);
+    rb_gc_mark((void *)ruby_scope);
+    rb_gc_mark((void *)ruby_dyna_vars);
     if (finalizer_table) {
        rb_mark_tbl(finalizer_table);
     }
@@ -1001,7 +1001,7 @@
 
     /* mark protected global variables */
     for (list = Global_List; list; list = list->next) {
-       rb_gc_mark(*list->varptr);
+       rb_gc_mark((void *)*list->varptr);
     }
     rb_mark_end_proc();
     rb_gc_mark_global_tbl();
diff -ru ruby.orig/signal.c ruby/signal.c
--- ruby.orig/signal.c  Mon Mar 19 17:07:49 2001
+++ ruby/signal.c       Sun Mar 18 19:27:21 2001
@@ -273,7 +273,7 @@
 
     for (i=0; i<NSIG; i++) {
        if (trap_list[i])
-           rb_gc_mark(trap_list[i]);
+           rb_gc_mark((void *)trap_list[i]);
     }
 #endif /* MACOS_UNUSE_SIGNAL */
 }
diff -ru ruby.orig/variable.c ruby/variable.c
--- ruby.orig/variable.c        Mon Mar 19 17:07:49 2001
+++ ruby/variable.c     Sun Mar 18 19:27:55 2001
@@ -818,7 +818,7 @@
     ID key;
     VALUE value;
 {
-    rb_gc_mark(value);
+    rb_gc_mark((void *)value);
     return ST_CONTINUE;
 }

-------
HAYASAKA, Ryo (早坂 良)
[e-mail] http://www.jaist.ac.jp/%7Eryoh/
Software Engineering laboratory (落水研)
Japan Advanced Institute of Science and Technology (JAIST)