From: Craig A. Berry <craigberry@mac.com>
Date: Thu, 4 Oct 2007 15:06:59 +0000 (+0000)
Subject: Try a bit harder to get *PL_sighandlerp to agree with its
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6e324d09363a859adf773fade66e3ec1cbf5eb15;p=p5sagit%2Fp5-mst-13.2.git

Try a bit harder to get *PL_sighandlerp to agree with its
prototype based on SA_SIGINFO definedness rather than Win32-ness.

p4raw-id: //depot/perl@32027
---

diff --git a/mg.c b/mg.c
index f6ba85d..8d98b6d 100644
--- a/mg.c
+++ b/mg.c
@@ -1346,15 +1346,13 @@ Perl_csighandler(int sig)
 	   (PL_signals & PERL_SIGNALS_UNSAFE_FLAG))
 	/* Call the perl level handler now--
 	 * with risk we may be in malloc() etc. */
-#ifdef WIN32
-	(*PL_sighandlerp)(sig);
-#else
+#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
 	(*PL_sighandlerp)(sig, NULL, NULL);
+#else
+	(*PL_sighandlerp)(sig);
 #endif
    else
 	S_raise_signal(aTHX_ sig);
-#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
-#endif
 }
 
 #if defined(FAKE_PERSISTENT_SIGNAL_HANDLERS) || defined(FAKE_DEFAULT_SIGNAL_HANDLERS)
@@ -1389,10 +1387,10 @@ Perl_despatch_signals(pTHX)
 	    PERL_BLOCKSIG_ADD(set, sig);
  	    PL_psig_pend[sig] = 0;
 	    PERL_BLOCKSIG_BLOCK(set);
-#ifdef WIN32
-	    (*PL_sighandlerp)(sig);
-#else
+#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
 	    (*PL_sighandlerp)(sig, NULL, NULL);
+#else
+	    (*PL_sighandlerp)(sig);
 #endif
 	    PERL_BLOCKSIG_UNBLOCK(set);
 	}