From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Sun, 31 Jul 2011 23:54:22 +0000 (-0700)
Subject: Punt HAVE_SIGACTION_SIGINFO_SIGNALS.
X-Git-Tag: mit-scheme-pucked-9.2.12~653
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=f6b89078ccb907bdebe57338b5dbc45082a70e7b;p=mit-scheme.git

Punt HAVE_SIGACTION_SIGINFO_SIGNALS.

It seems that DEFUN_STD_HANDLER assumes HAVE_SIGACTION_SIGINFO_SIGNALS
is defined.  Both definitions use Tsignal_handler_result, SIGINFO_T
and SIGCONTEXT_ARG_T.
---

diff --git a/src/gtk/gtkio.c.stay b/src/gtk/gtkio.c.stay
index 2fcbb0e1e..bb276953c 100644
--- a/src/gtk/gtkio.c.stay
+++ b/src/gtk/gtkio.c.stay
@@ -597,13 +597,8 @@ struct handler_record
   Tsignal_handler handler;
 };
 
-#ifdef HAVE_SIGACTION_SIGINFO_SIGNALS
-void
+Tsignal_handler_result
 signal_forwarder (int signo, siginfo_t *siginfo, void *ptr)
-#else
-REGSIGTYPE
-signal_forwarder (int signo)
-#endif
 {
   pthread_t self;
 
@@ -619,11 +614,7 @@ signal_forwarder (int signo)
 	  if (old->signo == signo)
 	    {
 	      trace ("signal_forwarder: running handler\n");
-#ifdef HAVE_SIGACTION_SIGINFO_SIGNALS
 	      (old->handler)(signo, siginfo, ptr);
-#else
-	      (old->handler)(signo);
-#endif
 	      return;
 	    }
 	  scan = scan->next;
@@ -656,20 +647,12 @@ init_signal_forwarder (int signo)
   err = sigaction (signo, 0, (&act));
   if (err != 0)
     complain ("init_signal_forwarder: sigaction access failed\n");
-#ifdef HAVE_SIGACTION_SIGINFO_SIGNALS
   handler = act.sa_sigaction;
-#else
-  handler = act.sa_handler;
-#endif
   if ((handler == ((Tsignal_handler) SIG_DFL))
       || (handler == (Tsignal_handler) SIG_IGN))
     return;
 
-#ifdef HAVE_SIGACTION_SIGINFO_SIGNALS
   act.sa_sigaction = &signal_forwarder;
-#else
-  act.sa_handler = &signal_forwarder;
-#endif
 
   err = sigaction (signo, &act, 0);
   if (err != 0)