[PATCH] [!SA_SIGINFO] fix

[Samuel Thibault]

Hi,

Some systems (like GNU/Hurd) don't have SA_SIGINFO.  Here is a patch.

Samuel
-------------- next part --------------
[libjava]/ChangeLog

2007-08-08  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* java/lang/natPosixProcess.cc (sigchld_handler) [!SA_SIGINFO]: Remove
	'si' and 'third' parameters.  Disable calling
	pmi->old_sigaction.sa_sigaction.
	(java::lang::PosixProcess*ProcessManager::init) [!SA_SIGINFO]: Set
	sa.sa_handler instead of sa.sa_sigaction, don't set SA_SIGINFO flag.

Index: libjava/java/lang/natPosixProcess.cc
===================================================================
--- libjava/java/lang/natPosixProcess.cc	(r??vision 127274)
+++ libjava/java/lang/natPosixProcess.cc	(copie de travail)
@@ -110,7 +110,11 @@
 // sigwait() on SIGCHLD.  The information passed is ignored as it
 // will be recovered by the waitpid() call.
 static void
+#ifdef SA_SIGINFO
 sigchld_handler (int sig, siginfo_t *si, void *third)
+#else
+sigchld_handler (int sig)
+#endif
 {
   if (PosixProcess$ProcessManager::nativeData != NULL)
     {
@@ -121,9 +125,11 @@
       if (pmi->old_sigaction.sa_handler != SIG_DFL
           && pmi->old_sigaction.sa_handler != SIG_IGN)
         {
+#ifdef SA_SIGINFO
           if ((pmi->old_sigaction.sa_flags & SA_SIGINFO) != 0)
             pmi->old_sigaction.sa_sigaction(sig, si, third);
           else
+#endif
             (*pmi->old_sigaction.sa_handler)(sig);
         }
     }
@@ -156,9 +162,15 @@ java::lang::PosixProcess$ProcessManager::init ()
       struct sigaction sa;
       memset (&sa, 0, sizeof (sa));
 
+#ifdef SA_SIGINFO
       sa.sa_sigaction = sigchld_handler;
       // We only want signals when the things exit.
       sa.sa_flags = SA_NOCLDSTOP | SA_SIGINFO;
+#else
+      sa.sa_handler = sigchld_handler;
+      // We only want signals when the things exit.
+      sa.sa_flags = SA_NOCLDSTOP;
+#endif
 
       if (-1 == sigaction (SIGCHLD, &sa, &pmi->old_sigaction))
         goto error;