From be252873386b399733f53ef99181d514543ac5ae Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Tue, 21 Oct 2008 00:58:48 +0200
Subject: [PATCH] Use gnulib's sys/wait.h replacement.

---
 ChangeLog                  |  8 ++++++++
 modules/posix_spawnp-tests |  1 +
 tests/test-posix_spawn1.c  | 19 -------------------
 tests/test-posix_spawn2.c  | 19 -------------------
 4 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2cf7e6221..2849469c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-10-20  Bruno Haible  <bruno@clisp.org>
 
+	* modules/posix_spawnp-tests (Depends-on): Add sys_wait.
+	* tests/test-posix_spawn1.c (WTERMSIG, WCOREDUMP, WEXITSTATUS,
+	WIFSIGNALED, WIFEXITED, WIFSTOPPED): Remove fallback definitions.
+	* tests/test-posix_spawn2.c (WTERMSIG, WCOREDUMP, WEXITSTATUS,
+	WIFSIGNALED, WIFEXITED, WIFSTOPPED): Likewise.
+
+2008-10-20  Bruno Haible  <bruno@clisp.org>
+
 	* m4/posix_spawn.m4 (gl_POSIX_SPAWN_WORKS): Test against another bug
 	of posix_spawn on AIX 5.3.
 
diff --git a/modules/posix_spawnp-tests b/modules/posix_spawnp-tests
index 7db28e826..7c045800f 100644
--- a/modules/posix_spawnp-tests
+++ b/modules/posix_spawnp-tests
@@ -17,6 +17,7 @@ posix_spawnattr_destroy
 sigprocmask
 stdbool
 unistd
+sys_wait
 
 configure.ac:
 
diff --git a/tests/test-posix_spawn1.c b/tests/test-posix_spawn1.c
index 9d3bb22d3..0c30b88d2 100644
--- a/tests/test-posix_spawn1.c
+++ b/tests/test-posix_spawn1.c
@@ -43,25 +43,6 @@ extern char **environ;
 # define STDERR_FILENO 2
 #endif
 
-#ifndef WTERMSIG
-# define WTERMSIG(x) ((x) & 0x7f)
-#endif
-#ifndef WCOREDUMP
-# define WCOREDUMP(x) ((x) & 0x80)
-#endif
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(x) (((x) >> 8) & 0xff)
-#endif
-#ifndef WIFSIGNALED
-# define WIFSIGNALED(x) (WTERMSIG (x) != 0 && WTERMSIG(x) != 0x7f)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(x) (WTERMSIG (x) == 0)
-#endif
-#ifndef WIFSTOPPED
-# define WIFSTOPPED(x) (WTERMSIG (x) == 0x7f)
-#endif
-
 #define CHILD_PROGRAM_FILENAME "test-posix_spawn1.sh"
 
 static int
diff --git a/tests/test-posix_spawn2.c b/tests/test-posix_spawn2.c
index e67582244..826d38b96 100644
--- a/tests/test-posix_spawn2.c
+++ b/tests/test-posix_spawn2.c
@@ -43,25 +43,6 @@ extern char **environ;
 # define STDERR_FILENO 2
 #endif
 
-#ifndef WTERMSIG
-# define WTERMSIG(x) ((x) & 0x7f)
-#endif
-#ifndef WCOREDUMP
-# define WCOREDUMP(x) ((x) & 0x80)
-#endif
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(x) (((x) >> 8) & 0xff)
-#endif
-#ifndef WIFSIGNALED
-# define WIFSIGNALED(x) (WTERMSIG (x) != 0 && WTERMSIG(x) != 0x7f)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(x) (WTERMSIG (x) == 0)
-#endif
-#ifndef WIFSTOPPED
-# define WIFSTOPPED(x) (WTERMSIG (x) == 0x7f)
-#endif
-
 #define CHILD_PROGRAM_FILENAME "test-posix_spawn2.sh"
 
 static int
-- 
2.11.0