[ruby-dev:10538] [PATCH] compiler warning, etc

なかだです。

  prototype 関係の warning がうるさかったのでこうしてみました。

  それはそうと、rb_thread_fd_writable() って何を返すはずですか。とりあえ
ず想像で補完してみましたが。


diff -pruPX ./mkpatch -2 current/eval.c devel/eval.c
--- current/eval.c	Thu Aug  3 18:50:32 2000
+++ devel/eval.c	Thu Aug  3 19:02:46 2000
@@ -1794,5 +1794,5 @@ rb_obj_is_block(block)
     VALUE block;
 {
-    if (TYPE(block) == T_DATA && RDATA(block)->dfree == blk_free) {
+    if (TYPE(block) == T_DATA && RDATA(block)->dfree == (RUBY_DATA_FUNC)blk_free) {
 	return Qtrue;
     }
@@ -6602,5 +6602,5 @@ rb_thread_check(data)
     VALUE data;
 {
-    if (TYPE(data) != T_DATA || RDATA(data)->dfree != thread_free) {
+    if (TYPE(data) != T_DATA || RDATA(data)->dfree != (RUBY_DATA_FUNC)thread_free) {
 	rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
 		 rb_class2name(CLASS_OF(data)));
@@ -7102,5 +7102,5 @@ rb_thread_fd_writable(fd)
     int fd;
 {
-    if (curr_thread == curr_thread->next) return;
+    if (curr_thread == curr_thread->next) return Qtrue;
 
     curr_thread->status = THREAD_STOPPED;
@@ -7112,4 +7112,6 @@ rb_thread_fd_writable(fd)
     curr_thread->wait_for = WAIT_SELECT;
     rb_thread_schedule();
+
+    return Qfalse;
 }
 
diff -pruPX ./mkpatch -2 current/gc.c devel/gc.c
--- current/gc.c	Wed Aug  2 13:54:11 2000
+++ devel/gc.c	Wed Aug  2 15:19:29 2000
@@ -279,13 +279,10 @@ rb_newobj()
     VALUE obj;
 
-    if (freelist) {
-      retry:
-	obj = (VALUE)freelist;
-	freelist = freelist->as.free.next;
-	return obj;
-    }
-    rb_gc();
+    if (!freelist)
+	rb_gc();
 
-    goto retry;
+    obj = (VALUE)freelist;
+    freelist = freelist->as.free.next;
+    return obj;
 }
 
@@ -672,5 +669,5 @@ gc_sweep()
 		    obj_free((VALUE)p);
 		}
-	if (need_call_final && FL_TEST(p, FL_FINALIZE)) {
+		if (need_call_final && FL_TEST(p, FL_FINALIZE)) {
 		    p->as.free.flag = FL_MARK; /* remain marked */
 		    p->as.free.next = final_list;
diff -pruPX ./mkpatch -2 current/io.c devel/io.c
--- current/io.c	Thu Jul 27 18:49:19 2000
+++ devel/io.c	Thu Aug  3 11:16:56 2000
@@ -1451,6 +1451,7 @@ pipe_del_fptr(fptr)
 }
 
+#if defined (NT) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__)
 static void
-pipe_atexit()
+pipe_atexit _((void))
 {
     struct pipe_list *list = pipe_list;
@@ -1463,4 +1464,5 @@ pipe_atexit()
     }
 }
+#endif
 
 static void
diff -pruPX ./mkpatch -2 current/process.c devel/process.c
--- current/process.c	Fri Jul 21 17:45:32 2000
+++ devel/process.c	Wed Aug  2 16:53:10 2000
@@ -575,5 +575,5 @@ rb_syswait(pid)
     int pid;
 {
-    RETSIGTYPE (*hfunc)(), (*qfunc)(), (*ifunc)();
+    RETSIGTYPE (*hfunc)_((int)), (*qfunc)_((int)), (*ifunc)_((int));
     int status;
     int i;
diff -pruPX ./mkpatch -2 current/signal.c devel/signal.c
--- current/signal.c	Sun May 14 01:12:16 2000
+++ devel/signal.c	Wed Aug  2 17:10:16 2000
@@ -283,5 +283,5 @@ void
 posix_signal(signum, handler)
     int signum;
-    RETSIGTYPE (*handler)();
+    RETSIGTYPE (*handler)_((int));
 {
     struct sigaction sigact;
@@ -337,4 +337,5 @@ signal_exec(sig)
 }
 
+static RETSIGTYPE sighandle _((int));
 static RETSIGTYPE
 sighandle(sig)
@@ -361,4 +362,5 @@ sighandle(sig)
 
 #ifdef SIGBUS
+static RETSIGTYPE sigbus _((int));
 static RETSIGTYPE
 sigbus(sig)
@@ -370,4 +372,5 @@ sigbus(sig)
 
 #ifdef SIGSEGV
+static RETSIGTYPE sigsegv _((int));
 static RETSIGTYPE
 sigsegv(sig)
@@ -421,6 +424,8 @@ static int trap_last_mask;
 # endif
 
+static RETSIGTYPE sigexit _((int));
 static RETSIGTYPE
-sigexit()
+sigexit(sig)
+    int sig;
 {
     rb_exit(0);
@@ -431,5 +436,5 @@ trap(arg)
     struct trap_arg *arg;
 {
-    RETSIGTYPE (*func)();
+    RETSIGTYPE (*func)_((int));
     VALUE command, old;
     int sig;


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦