From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 11 Dec 2012 02:36:12 +0000 (-0500)
Subject: fix regressions in app compatibility from previous sys/ipc.h changes
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=490d4a0e9e96eabffa553b279b07725c39010c1a;ds=sidebyside

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

despite glibc using __key and __seq rather than key and seq, some
applications, notably busybox, assume the names are key and seq unless
glibc is being used. and the names key and seq are really the ones
that _should_ be exposed when not attempting to present a
standards-conforming namespace; apps should not be using names that
begin with double-underscore. thus, the optimal fix is to use key and
seq as the actual names of the members when in bsd/gnu source profile,
and define macros for __key and __seq that redirect to plain key and
seq.
---

diff --git a/include/sys/ipc.h b/include/sys/ipc.h
index f4cb9ac6..c5a39819 100644
--- a/include/sys/ipc.h
+++ b/include/sys/ipc.h
@@ -16,6 +16,11 @@ extern "C" {
 #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>
 
 #define IPC_CREAT  01000