From: Jim Meyering <meyering@redhat.com>
Date: Mon, 3 May 2010 08:45:47 +0000 (+0200)
Subject: maint: remove now-redundant definitions provided by sys/wait.h
X-Git-Tag: v8.6~189
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9c542e416ffcd29dbe44845197442cc550e5370;p=thirdparty%2Fcoreutils.git

maint: remove now-redundant definitions provided by sys/wait.h

* src/timeout.c (WIFSIGNALED, WTERMSIG): Remove definitions,
now that gnulib guarantees they are defined in <sys/wait.h>.
* src/operand2sig.c: Likewise.
* src/kill.c: Likewise.
---

diff --git a/src/kill.c b/src/kill.c
index 09d280822b..4210c37b5d 100644
--- a/src/kill.c
+++ b/src/kill.c
@@ -21,14 +21,7 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include <signal.h>
-
 #include <sys/wait.h>
-#ifndef WIFSIGNALED
-# define WIFSIGNALED(s) (((s) & 0xFFFF) - 1 < (unsigned int) 0xFF)
-#endif
-#ifndef WTERMSIG
-# define WTERMSIG(s) ((s) & 0x7F)
-#endif
 
 #include "system.h"
 #include "error.h"
diff --git a/src/operand2sig.c b/src/operand2sig.c
index d0500cdac2..8c1e7802c5 100644
--- a/src/operand2sig.c
+++ b/src/operand2sig.c
@@ -24,14 +24,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <sys/types.h>
-
 #include <sys/wait.h>
-#ifndef WIFSIGNALED
-# define WIFSIGNALED(s) (((s) & 0xFFFF) - 1 < (unsigned int) 0xFF)
-#endif
-#ifndef WTERMSIG
-# define WTERMSIG(s) ((s) & 0x7F)
-#endif
 
 #include "system.h"
 #include "error.h"
diff --git a/src/timeout.c b/src/timeout.c
index c6f65258bf..e2234c3f04 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -51,13 +51,6 @@
 #include <signal.h>
 #include <sys/wait.h>
 
-#ifndef WIFSIGNALED
-# define WIFSIGNALED(s) (((s) & 0xFFFF) - 1 < (unsigned int) 0xFF)
-#endif
-#ifndef WTERMSIG
-# define WTERMSIG(s) ((s) & 0x7F)
-#endif
-
 #include "system.h"
 #include "xstrtol.h"
 #include "sig2str.h"