From f942204699420d6ec55f3d77cd29f0f096147f34 Mon Sep 17 00:00:00 2001
Message-Id: <f942204699420d6ec55f3d77cd29f0f096147f34.1714059157.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Mon, 2 Jun 2008 13:34:21 +0100
Subject: [PATCH] Build fix for Linux
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 lib/macros-builtin.c     | 1 -
 lib/trackdb.c            | 1 -
 lib/wstat.c              | 1 -
 lib/wstat.h              | 2 ++
 libtests/test.h          | 1 -
 server/disorder-server.h | 1 -
 6 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/macros-builtin.c b/lib/macros-builtin.c
index 8123f2b..ec5628d 100644
--- a/lib/macros-builtin.c
+++ b/lib/macros-builtin.c
@@ -31,7 +31,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 
 #include "hash.h"
 #include "mem.h"
diff --git a/lib/trackdb.c b/lib/trackdb.c
index 689af09..4009358 100644
--- a/lib/trackdb.c
+++ b/lib/trackdb.c
@@ -35,7 +35,6 @@
 #include <sys/resource.h>
 #include <time.h>
 #include <arpa/inet.h>
-#include <sys/wait.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <gcrypt.h>
diff --git a/lib/wstat.c b/lib/wstat.c
index 0e33d1f..1b541e9 100644
--- a/lib/wstat.c
+++ b/lib/wstat.c
@@ -23,7 +23,6 @@
 
 #include "common.h"
 
-#include <sys/wait.h>
 #include <signal.h>
 
 #include "mem.h"
diff --git a/lib/wstat.h b/lib/wstat.h
index afae594..944048d 100644
--- a/lib/wstat.h
+++ b/lib/wstat.h
@@ -24,6 +24,8 @@
 #ifndef WSTAT_H
 #define WSTAT_H
 
+#include <sys/wait.h>
+
 const char *wstat(int w);
 /* Format wait status @w@.  In extremis the return value might be a
  * pointer to a string literal.  The result should always be ASCII. */
diff --git a/libtests/test.h b/libtests/test.h
index 8af85d5..a4f478e 100644
--- a/libtests/test.h
+++ b/libtests/test.h
@@ -30,7 +30,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <signal.h>
-#include <sys/wait.h>
 #include <stddef.h>
 #include <sys/socket.h>
 #include <netdb.h>
diff --git a/server/disorder-server.h b/server/disorder-server.h
index d09420c..361bd4f 100644
--- a/server/disorder-server.h
+++ b/server/disorder-server.h
@@ -41,7 +41,6 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/un.h>
-#include <sys/wait.h>
 #include <syslog.h>
 #include <time.h>
 #include <unistd.h>
-- 
[mdw]