summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-04-21 14:27:28 -0400
committerRich Felker <dalias@aerifal.cx>2011-04-21 14:27:28 -0400
commit4b5f054098e484baa6d457aebe8bdab0eeb90215 (patch)
tree75489953a06be344241bbeea95a6eac5cb3cddfc
parentf492c95401b3a6fedb3973631496ee329447b25e (diff)
downloadmusl-4b5f054098e484baa6d457aebe8bdab0eeb90215.tar.gz
move wait.h macros out of bits. they do not vary.
-rw-r--r--arch/i386/bits/wait.h13
-rw-r--r--arch/i386/bits/wexitstatus.h10
-rw-r--r--arch/x86_64/bits/wait.h13
-rw-r--r--arch/x86_64/bits/wexitstatus.h10
-rw-r--r--include/stdlib.h9
-rw-r--r--include/sys/wait.h24
6 files changed, 30 insertions, 49 deletions
diff --git a/arch/i386/bits/wait.h b/arch/i386/bits/wait.h
deleted file mode 100644
index ae3f1012..00000000
--- a/arch/i386/bits/wait.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define WNOHANG 1
-#define WUNTRACED 2
-
-#define WSTOPPED 2
-#define WEXITED 4
-#define WCONTINUED 8
-#define WNOWAIT 0x1000000
-
-#if defined(__XOPEN_SOURCE) || defined(__GNU_SOURCE)
-#define P_ALL 0
-#define P_PID 1
-#define P_PGID 2
-#endif
diff --git a/arch/i386/bits/wexitstatus.h b/arch/i386/bits/wexitstatus.h
deleted file mode 100644
index 591d401a..00000000
--- a/arch/i386/bits/wexitstatus.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(s) (((s) & 0xff00) >> 8)
-#define WTERMSIG(s) ((s) & 0x7f)
-#define WSTOPSIG(s) WEXITSTATUS(s)
-#define WCOREDUMP(s) ((s) & 0x80)
-#define WIFEXITED(s) (!WTERMSIG(s))
-#define WIFSTOPPED(s) (((s) & 0xff) == 0x7f)
-#define WIFSIGNALED(s) (((signed char) (((s) & 0x7f) + 1) >> 1) > 0)
-#define WIFCONTINUED(s) ((s) == 0xffff)
-#endif
diff --git a/arch/x86_64/bits/wait.h b/arch/x86_64/bits/wait.h
deleted file mode 100644
index ae3f1012..00000000
--- a/arch/x86_64/bits/wait.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define WNOHANG 1
-#define WUNTRACED 2
-
-#define WSTOPPED 2
-#define WEXITED 4
-#define WCONTINUED 8
-#define WNOWAIT 0x1000000
-
-#if defined(__XOPEN_SOURCE) || defined(__GNU_SOURCE)
-#define P_ALL 0
-#define P_PID 1
-#define P_PGID 2
-#endif
diff --git a/arch/x86_64/bits/wexitstatus.h b/arch/x86_64/bits/wexitstatus.h
deleted file mode 100644
index 591d401a..00000000
--- a/arch/x86_64/bits/wexitstatus.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(s) (((s) & 0xff00) >> 8)
-#define WTERMSIG(s) ((s) & 0x7f)
-#define WSTOPSIG(s) WEXITSTATUS(s)
-#define WCOREDUMP(s) ((s) & 0x80)
-#define WIFEXITED(s) (!WTERMSIG(s))
-#define WIFSTOPPED(s) (((s) & 0xff) == 0x7f)
-#define WIFSIGNALED(s) (((signed char) (((s) & 0x7f) + 1) >> 1) > 0)
-#define WIFCONTINUED(s) ((s) == 0xffff)
-#endif
diff --git a/include/stdlib.h b/include/stdlib.h
index a12192f0..023f6e78 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -81,7 +81,14 @@ size_t wcstombs (char *, const wchar_t *, size_t);
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
#ifndef WEXITSTATUS
-#include <bits/wexitstatus.h>
+#define WEXITSTATUS(s) (((s) & 0xff00) >> 8)
+#define WTERMSIG(s) ((s) & 0x7f)
+#define WSTOPSIG(s) WEXITSTATUS(s)
+#define WCOREDUMP(s) ((s) & 0x80)
+#define WIFEXITED(s) (!WTERMSIG(s))
+#define WIFSTOPPED(s) (((s) & 0xff) == 0x7f)
+#define WIFSIGNALED(s) (((signed char) (((s) & 0x7f) + 1) >> 1) > 0)
+#define WIFCONTINUED(s) ((s) == 0xffff)
#endif
int posix_memalign (void **, size_t, size_t);
diff --git a/include/sys/wait.h b/include/sys/wait.h
index ae41a48e..e73594ae 100644
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@@ -23,8 +23,28 @@ pid_t wait3 (int *, int, struct rusage *);
pid_t wait4 (pid_t, int *, int, struct rusage *);
#endif
-#include <bits/wait.h>
-#include <bits/wexitstatus.h>
+#define WNOHANG 1
+#define WUNTRACED 2
+
+#define WSTOPPED 2
+#define WEXITED 4
+#define WCONTINUED 8
+#define WNOWAIT 0x1000000
+
+#define P_ALL 0
+#define P_PID 1
+#define P_PGID 2
+
+#ifndef WEXITSTATUS
+#define WEXITSTATUS(s) (((s) & 0xff00) >> 8)
+#define WTERMSIG(s) ((s) & 0x7f)
+#define WSTOPSIG(s) WEXITSTATUS(s)
+#define WCOREDUMP(s) ((s) & 0x80)
+#define WIFEXITED(s) (!WTERMSIG(s))
+#define WIFSTOPPED(s) (((s) & 0xff) == 0x7f)
+#define WIFSIGNALED(s) (((signed char) (((s) & 0x7f) + 1) >> 1) > 0)
+#define WIFCONTINUED(s) ((s) == 0xffff)
+#endif
#ifdef __cplusplus
}