From: Guillem Jover <guillem@hadrons.org>
Date: Thu, 8 Oct 2009 11:40:12 +0000 (+0200)
Subject: ipcs: use __GLIBC__ instead of obsolete __GNU_LIBRARY__
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=feada32ffc0c48827809fe174ffb4d1cc88462c8;p=util-linux

ipcs: use __GLIBC__ instead of obsolete __GNU_LIBRARY__

The latter is obsolete and it's currently defined to 6 for historical
reasons (as per comment in <features.h>) instead of 2 as what would be
expected.

Signed-off-by: Guillem Jover <guillem@hadrons.org>
---

diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index 0e645d13..766e5869 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -88,11 +88,9 @@ union semun {
 #endif
 
 /* X/OPEN (Jan 1987) does not define fields key, seq in struct ipc_perm;
-   libc 4/5 does not mention struct ipc_term at all, but includes
-   <linux/ipc.h>, which defines a struct ipc_perm with such fields.
    glibc-1.09 has no support for sysv ipc.
    glibc 2 uses __key, __seq */
-#if defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
+#if defined (__GLIBC__) && __GLIBC__ >= 2
 #define KEY __key
 #else
 #define KEY key