Patchwork [gccgo] Rename sigsend to __go_sigsend

login
register
mail settings
Submitter Ian Taylor
Date July 19, 2010, 8:29 a.m.
Message ID <mcrvd8bkh7o.fsf@google.com>
Download mbox | patch
Permalink /patch/59181/
State New
Headers show

Comments

Ian Taylor - July 19, 2010, 8:29 a.m.
This patch renames sigsend to __go_sigsend in libgo, to avoid a conflict
with a function of the same name in the OpenSolaris signal.h (the name
sigsend comes from the other Go library).  Committed to gccgo branch.

Ian

Patch

diff -r 2e8dbd5a5306 libgo/runtime/go-signal.c
--- a/libgo/runtime/go-signal.c	Tue Jul 13 02:46:01 2010 -0700
+++ b/libgo/runtime/go-signal.c	Mon Jul 19 01:26:28 2010 -0700
@@ -142,7 +142,7 @@ 
       __go_panic_msg (msg);
     }
 
-  if (sigsend (sig))
+  if (__go_sigsend (sig))
     return;
   for (i = 0; signals[i].sig != -1; ++i)
     {
diff -r 2e8dbd5a5306 libgo/runtime/runtime.h
--- a/libgo/runtime/runtime.h	Tue Jul 13 02:46:01 2010 -0700
+++ b/libgo/runtime/runtime.h	Mon Jul 19 01:26:28 2010 -0700
@@ -105,7 +105,7 @@ 
 void*	mal(uintptr);
 void	mallocinit(void);
 void	siginit(void);
-bool	sigsend(int32 sig);
+bool	__go_sigsend(int32 sig);
 
 /*
  * mutual exclusion locks.  in the uncontended case,
diff -r 2e8dbd5a5306 libgo/runtime/sigqueue.goc
--- a/libgo/runtime/sigqueue.goc	Tue Jul 13 02:46:01 2010 -0700
+++ b/libgo/runtime/sigqueue.goc	Mon Jul 19 01:26:28 2010 -0700
@@ -56,7 +56,7 @@ 
 
 // Called from sighandler to send a signal back out of the signal handling thread.
 bool
-sigsend(int32 s)
+__go_sigsend(int32 s)
 {
 	uint32 bit, mask;