aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2019-07-31 20:35:37 -0400
committerRich Felker <dalias@aerifal.cx>2019-08-02 00:08:23 -0400
commit006a75a99789f383713e4f47affd7c90e39cc827 (patch)
treea9b932585992c90c364a06194ea06cf88ce3fd7d
parent3541925fb1db0bce7eaca7900fdd624e2f50ed6d (diff)
downloadmusl-006a75a99789f383713e4f47affd7c90e39cc827.tar.gz
musl-006a75a99789f383713e4f47affd7c90e39cc827.tar.xz
musl-006a75a99789f383713e4f47affd7c90e39cc827.zip
move IPC_STAT definition to a new bits/ipcstat.h file
otherwise, 32-bit archs that could otherwise share the generic bits/ipc.h would need to duplicate the struct ipc_perm definition, obscuring the fact that it's the same. sysvipc is not widely used and these headers are not commonly included, so there is no performance gain to be had by limiting the number of indirectly included files here. files with the existing time32 definition of IPC_STAT are added to all current 32-bit archs now, so that when it's changed the change will show up as a change rather than addition of a new file where it's less obvious that the value is changing vs the generic one that was used before.
-rw-r--r--arch/arm/bits/ipcstat.h1
-rw-r--r--arch/generic/bits/ipcstat.h1
-rw-r--r--arch/i386/bits/ipcstat.h1
-rw-r--r--arch/m68k/bits/ipcstat.h1
-rw-r--r--arch/microblaze/bits/ipcstat.h1
-rw-r--r--arch/mips/bits/ipcstat.h1
-rw-r--r--arch/mipsn32/bits/ipcstat.h1
-rw-r--r--arch/or1k/bits/ipcstat.h1
-rw-r--r--arch/powerpc/bits/ipcstat.h1
-rw-r--r--arch/sh/bits/ipcstat.h1
-rw-r--r--include/sys/ipc.h4
11 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/bits/ipcstat.h b/arch/arm/bits/ipcstat.h
new file mode 100644
index 00000000..0018ad1e
--- /dev/null
+++ b/arch/arm/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 2
diff --git a/arch/generic/bits/ipcstat.h b/arch/generic/bits/ipcstat.h
new file mode 100644
index 00000000..0018ad1e
--- /dev/null
+++ b/arch/generic/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 2
diff --git a/arch/i386/bits/ipcstat.h b/arch/i386/bits/ipcstat.h
new file mode 100644
index 00000000..0018ad1e
--- /dev/null
+++ b/arch/i386/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 2
diff --git a/arch/m68k/bits/ipcstat.h b/arch/m68k/bits/ipcstat.h
new file mode 100644
index 00000000..0018ad1e
--- /dev/null
+++ b/arch/m68k/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 2
diff --git a/arch/microblaze/bits/ipcstat.h b/arch/microblaze/bits/ipcstat.h
new file mode 100644
index 00000000..0018ad1e
--- /dev/null
+++ b/arch/microblaze/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 2
diff --git a/arch/mips/bits/ipcstat.h b/arch/mips/bits/ipcstat.h
new file mode 100644
index 00000000..0018ad1e
--- /dev/null
+++ b/arch/mips/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 2
diff --git a/arch/mipsn32/bits/ipcstat.h b/arch/mipsn32/bits/ipcstat.h
new file mode 100644
index 00000000..0018ad1e
--- /dev/null
+++ b/arch/mipsn32/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 2
diff --git a/arch/or1k/bits/ipcstat.h b/arch/or1k/bits/ipcstat.h
new file mode 100644
index 00000000..0018ad1e
--- /dev/null
+++ b/arch/or1k/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 2
diff --git a/arch/powerpc/bits/ipcstat.h b/arch/powerpc/bits/ipcstat.h
new file mode 100644
index 00000000..0018ad1e
--- /dev/null
+++ b/arch/powerpc/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 2
diff --git a/arch/sh/bits/ipcstat.h b/arch/sh/bits/ipcstat.h
new file mode 100644
index 00000000..0018ad1e
--- /dev/null
+++ b/arch/sh/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 2
diff --git a/include/sys/ipc.h b/include/sys/ipc.h
index cde376fc..9e366b7b 100644
--- a/include/sys/ipc.h
+++ b/include/sys/ipc.h
@@ -22,6 +22,7 @@ extern "C" {
#endif
#include <bits/ipc.h>
+#include <bits/ipcstat.h>
#define IPC_CREAT 01000
#define IPC_EXCL 02000
@@ -29,9 +30,6 @@ extern "C" {
#define IPC_RMID 0
#define IPC_SET 1
-#ifndef IPC_STAT
-#define IPC_STAT 2
-#endif
#define IPC_INFO 3
#define IPC_PRIVATE ((key_t) 0)