unifdef SYSV

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

2 files changed, 1 insertions, 13 deletions

diff --git a/choose.c b/choose.c
index 4bf434f..51f728a 100644
--- a/choose.c
+++ b/choose.c
@@ -39,15 +39,11 @@ in this Software without prior written authorization from The Open Group.
 #ifndef X_NOT_POSIX
 #include <dirent.h>
 #else
-#ifdef SYSV
-#include <dirent.h>
-#else
 #include <sys/dir.h>
 #ifndef dirent
 #define dirent direct
 #endif
 #endif
-#endif
 
 static Pixel save_message_foreground;
 static Pixel save_message_background;
diff --git a/signals.c b/signals.c
index a4452f4..7029544 100644
--- a/signals.c
+++ b/signals.c
@@ -61,14 +61,10 @@ in this Software without prior written authorization from The Open Group.
 #define USE_POSIX_WAIT
 #endif
 
-#if defined(linux) || defined(SYSV)
+#ifdef linux
 #define USE_SYSV_SIGNALS
 #endif
 
-#if defined(X_NOT_POSIX) && defined(SYSV)
-#define SIGNALS_RESET_WHEN_CAUGHT
-#endif
-
 #include <stddef.h>
 
 #include "xsm.h"
@@ -101,10 +97,6 @@ sig_child_handler (int sig)
     wait (NULL);
 #endif
 
-#ifdef SIGNALS_RESET_WHEN_CAUGHT
-    Signal (SIGCHLD, sig_child_handler);
-#endif
-
     /*
      * The wait() above must come before re-establishing the signal handler.
      * In between this time, a new child might have died.  If we can do