commit 7c6afc3967146deb554f76833aa64df0a74ddf96
parent 5e19cf3a6c2e0e6a8c225602580ce1eefe2ec73f
Author: Kyle Milz <krwmilz@gmail.com>
Date: Thu, 19 Aug 2021 20:38:37 +0000
assume we have sys/wait.h
Diffstat:
4 files changed, 4 insertions(+), 38 deletions(-)
diff --git a/events.c b/events.c
@@ -55,7 +55,7 @@ NOTE:
#include <signal.h>
#include <sys/file.h> /* this defines FASYNC */
#include <sys/ioctl.h> /* this defines SIOCSPGRP and FIOASYNC */
-#include <sys/wait.h> /* ignore HAVE_SYS_WAIT_H -- we always need WNOHANG */
+#include <sys/wait.h> /* we always need WNOHANG */
/* Linux prefers O_ASYNC over FASYNC; SGI IRIX does the opposite. */
#if !defined(FASYNC) && defined(O_ASYNC)
diff --git a/font-open.c b/font-open.c
@@ -1794,15 +1794,7 @@ try_size(font, dpi, ret_path)
#define EXIT_SUCCESS 0
#endif
-#if HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif
+#include <sys/wait.h>
#include <poll.h>
#define XIO_IN POLLIN
diff --git a/popups.c b/popups.c
@@ -56,24 +56,7 @@ IN THE SOFTWARE.
#include <stdarg.h>
-#if HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(status) (((status) & 255) == 0)
-#endif
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(status) ((unsigned)(status) >> 8)
-#endif
-#ifndef WIFSIGNALED
-# ifndef WIFSTOPPED
-# define WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
-# endif
-# define WIFSIGNALED(status) (!WIFSTOPPED(status) && !WIFEXITED(status))
-#endif
-#ifndef WTERMSIG
-# define WTERMSIG(status) ((status) & 0x7f)
-#endif
+#include <sys/wait.h>
#ifdef EWOULDBLOCK
# ifdef EAGAIN
diff --git a/special.c b/special.c
@@ -64,16 +64,7 @@ extern double floor(double);
#if PS
# include <errno.h>
-
-# if HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-# endif
-# ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-# endif
-# ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-# endif
+# include <sys/wait.h>
#endif /* PS */
#define MAXPOINTS 300 /* Max points in a path */