summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKylie McClain <somasis@exherbo.org>2016-01-15 00:08:16 -0500
committerBenoît Dejean <bdejean@gmail.com>2016-02-16 18:12:00 +0100
commit94968b440646a166b08f79391311eea1dd07ac0a (patch)
tree964170fa4ab6eea3e244440386503836e0e5f1d4
parent819bfe56ee84340315193ffcb72244c4a23ad3ac (diff)
downloadlibgtop-94968b440646a166b08f79391311eea1dd07ac0a.tar.gz
Fix building on musl-libc
libgtop fails to build on musl libc, due to the header resulting in the headers that would be loaded for libc 5 being loaded on musl libc. musl defines headers which are also defined in linux-headers' in.h, causing redefinition errors. https://bugzilla.gnome.org/show_bug.cgi?id=760655 Signed-off-by: Benoît Dejean <bdejean@gmail.com>
-rw-r--r--sysdeps/linux/netload.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c
index b91def07..dcfea34b 100644
--- a/sysdeps/linux/netload.c
+++ b/sysdeps/linux/netload.c
@@ -34,7 +34,7 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
+#if !defined (__GLIBC__) || __GNU_LIBRARY__ > 1
/* GNU LibC */
#include <net/if.h>
#include <netinet/ip_icmp.h>
@@ -43,7 +43,7 @@
#include <netinet/tcp.h>
#include <netinet/udp.h>
#include <net/if.h>
-#else /* Libc 5 */
+#elif defined (__GLIBC__) /* Libc 5 */
#include <linux/if.h>
#include <linux/in.h>
#include <linux/ip.h>