[kaffe] CVS kaffe (guilhem): Another fix for Ch.

Kaffe CVS cvs-commits at kaffe.org
Wed Dec 29 03:32:51 PST 2004


PatchSet 5729 
Date: 2004/12/29 11:28:30
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Another fix for Ch.

	* kaffe/kaffevm/systems/unix-pthreads/jsignal.h,
	kaffe/kaffevm/systems/unix-jthreads/jsignal.h,
	kaffe/kaffevm/systems/unix-pthreads/signal.c,
	kaffe/kaffevm/systems/unix-jthreads/signal.c:
	Made ignoreSignal private to signal.c. This symbol may conflict
	with Ch.

	Reported by Kabileshkumar Cheetancheri <cgkabilesh at yahoo.com>

Members: 
	ChangeLog:1.3273->1.3274 
	kaffe/kaffevm/systems/unix-jthreads/signal.c:1.26->1.27 
	kaffe/kaffevm/systems/unix-pthreads/jsignal.h:1.3->1.4 
	kaffe/kaffevm/systems/unix-pthreads/signal.c:1.15->1.16 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3273 kaffe/ChangeLog:1.3274
--- kaffe/ChangeLog:1.3273	Mon Dec 27 18:12:27 2004
+++ kaffe/ChangeLog	Wed Dec 29 11:28:30 2004
@@ -1,3 +1,14 @@
+2004-12-29  Guilhem Lavaux  <guilhem at kaffe.org>
+
+	* kaffe/kaffevm/systems/unix-pthreads/jsignal.h,
+	kaffe/kaffevm/systems/unix-jthreads/jsignal.h,
+	kaffe/kaffevm/systems/unix-pthreads/signal.c,
+	kaffe/kaffevm/systems/unix-jthreads/signal.c:
+	Made ignoreSignal private to signal.c. This symbol may conflict
+	with Ch.
+
+	Reported by Kabileshkumar Cheetancheri <cgkabilesh at yahoo.com>
+	
 2004-12-27  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* test/regression/ProhibitedClass.java: Changed the output to be less
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/signal.c
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/signal.c:1.26 kaffe/kaffe/kaffevm/systems/unix-jthreads/signal.c:1.27
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/signal.c:1.26	Wed Sep  1 10:02:43 2004
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/signal.c	Wed Dec 29 11:28:32 2004
@@ -38,6 +38,7 @@
 
 static void nullException(SIGNAL_ARGS(sig, sc));
 static void floatingException(EXCEPTIONPROTO);
+static void ignoreSignal(int sig);
 
 static exchandler_t nullHandler;
 static exchandler_t floatingHandler;
@@ -280,7 +281,7 @@
 /*
  * Ignore the given signal.
  */
-void
+static void
 ignoreSignal(int sig)
 {
 	registerSignalHandler(sig, SIG_IGN, false);
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/jsignal.h
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/jsignal.h:1.3 kaffe/kaffe/kaffevm/systems/unix-pthreads/jsignal.h:1.4
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/jsignal.h:1.3	Thu Jul  8 17:29:52 2004
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/jsignal.h	Wed Dec 29 11:28:33 2004
@@ -37,7 +37,6 @@
 
 void registerTerminalSignal(int sig, void* handler);
 
-void ignoreSignal(int sig);
 void clearSignal(int sig);
 void unblockSignal(int sig);
 void unblockAsyncSignals(void);
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c:1.15 kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c:1.16
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c:1.15	Mon Dec 20 02:29:52 2004
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c	Wed Dec 29 11:28:33 2004
@@ -49,6 +49,7 @@
 
 static void nullException(SIGNAL_ARGS(sig, sc));
 static void floatingException(EXCEPTIONPROTO);
+static void ignoreSignal(int sig);
 
 static exchandler_t nullHandler;
 static exchandler_t floatingHandler;
@@ -291,7 +292,7 @@
 /*
  * Ignore the given signal.
  */
-void
+static void
 ignoreSignal(int sig)
 {
 	registerSignalHandler(sig, SIG_IGN, false);




More information about the kaffe mailing list