fix regressions in app compatibility from previous sys/ipc.h changes

[musl] / include / sys / ipc.h

diff --git a/include/sys/ipc.h b/include/sys/ipc.h
index 8e2f717..c5a3981 100644 (file)
--- a/include/sys/ipc.h
+++ b/include/sys/ipc.h
@@ -4,6 +4,8 @@
 extern "C" {
 #endif
 
 extern "C" {
 #endif
 

+#include <features.h>
+

 #define __NEED_uid_t
 #define __NEED_gid_t
 #define __NEED_mode_t
 #define __NEED_uid_t
 #define __NEED_gid_t
 #define __NEED_mode_t


@@ -11,9 +13,12 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
 
 #include <bits/alltypes.h>
 

-#ifdef _GNU_SOURCE
-#define __ipc_perm_key key
-#define __ipc_perm_seq seq
+#define __ipc_perm_key __key
+#define __ipc_perm_seq __seq
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define __key key
+#define __seq seq

 #endif
 
 #include <bits/ipc.h>
 #endif
 
 #include <bits/ipc.h>