Assume signal handlers return void, as C89 requires

Signed-off-by: Gaetan Nadon <[email protected]>
---
 signals.c |   16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/signals.c b/signals.c
index 248e9ca..55600c6 100644
--- a/signals.c
+++ b/signals.c
@@ -74,12 +74,6 @@ in this Software without prior written authorization from 
The Open Group.
 #include "list.h"
 #include "save.h"
 
-#if defined(X_NOT_POSIX) && defined(SIGNALRETURNSINT)
-#define SIGVAL int
-#else
-#define SIGVAL void
-#endif
-
 #ifndef X_NOT_POSIX
 #define USE_POSIX_WAIT
 #endif
@@ -103,8 +97,8 @@ in this Software without prior written authorization from 
The Open Group.
 int checkpoint_from_signal = 0;
 
 
-static SIGVAL
-Signal(int sig, SIGVAL (*handler)(int))
+static void
+Signal(int sig, void (*handler)(int))
 {
 #ifndef X_NOT_POSIX
     struct sigaction sigact, osigact;
@@ -112,13 +106,7 @@ Signal(int sig, SIGVAL (*handler)(int))
     sigemptyset(&sigact.sa_mask);
     sigact.sa_flags = 0;
     sigaction(sig, &sigact, &osigact);
-#  if defined(SIGNALRETURNSINT)
-    return osigact.sa_handler;
-#  endif
 #else
-#  if defined(SIGNALRETURNSINT)
-    return
-#  endif
     signal(sig, handler);
 #endif
 }
-- 
1.7.9.5

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to