From 006a75a99789f383713e4f47affd7c90e39cc827 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 31 Jul 2019 20:35:37 -0400 Subject: [PATCH] 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. --- arch/arm/bits/ipcstat.h | 1 + arch/generic/bits/ipcstat.h | 1 + arch/i386/bits/ipcstat.h | 1 + arch/m68k/bits/ipcstat.h | 1 + arch/microblaze/bits/ipcstat.h | 1 + arch/mips/bits/ipcstat.h | 1 + arch/mipsn32/bits/ipcstat.h | 1 + arch/or1k/bits/ipcstat.h | 1 + arch/powerpc/bits/ipcstat.h | 1 + arch/sh/bits/ipcstat.h | 1 + include/sys/ipc.h | 4 +--- 11 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 arch/arm/bits/ipcstat.h create mode 100644 arch/generic/bits/ipcstat.h create mode 100644 arch/i386/bits/ipcstat.h create mode 100644 arch/m68k/bits/ipcstat.h create mode 100644 arch/microblaze/bits/ipcstat.h create mode 100644 arch/mips/bits/ipcstat.h create mode 100644 arch/mipsn32/bits/ipcstat.h create mode 100644 arch/or1k/bits/ipcstat.h create mode 100644 arch/powerpc/bits/ipcstat.h create mode 100644 arch/sh/bits/ipcstat.h 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 +#include #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) -- 2.25.1