From c4f1dbdae415f8b66dd1cc13359c9370d9c5833b Mon Sep 17 00:00:00 2001
From: crs <cschoeneman@gmail.com>
Date: Wed, 19 Jun 2002 12:21:26 +0000
Subject: [PATCH] checkpoint.  automake changes for wait().

---
 configure.in               |  4 ++--
 platform/CUnixPlatform.cpp | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 3b2cddba..9be8fbc4 100644
--- a/configure.in
+++ b/configure.in
@@ -17,10 +17,11 @@ ACX_PTHREAD(,AC_MSG_ERROR(You must have pthreads to compile synergy))
 
 dnl checks for header files
 AC_HEADER_STDC
-AC_HEADER_TIME
 AC_CHECK_HEADERS([unistd.h sys/time.h])
 AC_CHECK_HEADERS([istream ostream])
 AC_CHECK_HEADERS([windows.h])
+AC_HEADER_SYS_WAIT
+AC_HEADER_TIME
 AC_PATH_X
 AC_PATH_XTRA
 AC_CHECK_HEADERS([X11/extensions/XTest.h])
@@ -48,7 +49,6 @@ AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(gmtime_r)
 AC_CHECK_FUNCS(getpwuid_r)
 dnl use AC_REPLACE_FUNCS() for stuff in string.h
-dnl AC_HEADER_SYS_WAIT
 
 dnl checks for system services
 
diff --git a/platform/CUnixPlatform.cpp b/platform/CUnixPlatform.cpp
index 484bfb3e..21f61710 100644
--- a/platform/CUnixPlatform.cpp
+++ b/platform/CUnixPlatform.cpp
@@ -5,10 +5,25 @@
 #include <pwd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <fcntl.h>
 #include <syslog.h>
 #include <signal.h>
+#if HAVE_SYS_WAIT_H
+#	include <sys/wait.h>
+#endif
+#if !defined(WIFSIGNALED)
+#	define WIFSIGNALED(w)	(((w) & 0xff) != 0x7f && ((w) & 0xff) != 0)
+#endif
+#if !defined(WIFEXITED)
+#	define WIFEXITED(w)		(((w) & 0xff) == 0)
+#endif
+#if !defined(WTERMSIG)
+#	define WTERMSIG(w)		((w) & 0x7f)
+#endif
+#if !defined(WEXITSTATUS)
+#	define WEXITSTATUS(w)	(((w) >> 8) & 0xff)
+#endif
+
 
 //
 // CUnixPlatform