From 29b76dcd83a9e1068f4835a8540b2e22314a0abb Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 27 Jan 2017 14:52:45 +0100
Subject: Remove support for !defined(__GLIBC__) and __GLIBC__ != 2.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
 ax25/bpqparms.c | 2 --
 ax25/mheardd.c  | 4 ----
 ax25/rxecho.c   | 8 --------
 3 files changed, 14 deletions(-)

(limited to 'ax25')

diff --git a/ax25/bpqparms.c b/ax25/bpqparms.c
index 27007dc..a29bd6a 100644
--- a/ax25/bpqparms.c
+++ b/ax25/bpqparms.c
@@ -29,9 +29,7 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#ifdef __GLIBC__
 #include <net/ethernet.h> /* is this really needed ??  */
-#endif
 
 #include <linux/bpqether.h> /* xlz - dammit, we need this again */
 
diff --git a/ax25/mheardd.c b/ax25/mheardd.c
index cbe5e26..a1c121b 100644
--- a/ax25/mheardd.c
+++ b/ax25/mheardd.c
@@ -15,11 +15,7 @@
 
 #include <sys/socket.h>
 
-#ifdef __GLIBC__
 #include <net/ethernet.h>
-#else
-#include <linux/if_ether.h>
-#endif
 
 #include <netinet/in.h>
 
diff --git a/ax25/rxecho.c b/ax25/rxecho.c
index 597e6cb..bfc326a 100644
--- a/ax25/rxecho.c
+++ b/ax25/rxecho.c
@@ -87,7 +87,6 @@
 #endif
 
 #include <features.h>    /* for the glibc version number */
-#if __GLIBC__ >= 2
 #ifdef	USE_SOCKADDR_SPKT
 #include <net/if_packet.h>
 #endif
@@ -97,13 +96,6 @@
 #include <netpacket/packet.h>
 #endif
 #include <net/ethernet.h>
-#else
-#if defined(USE_SOCKADDR_SPKT) || defined(USE_SOCKADDR_SLL)
-#include <asm/types.h>
-#include <linux/if_packet.h>
-#endif
-#include <linux/if_ether.h>
-#endif
 
 #include <netinet/in.h>
 
-- 
cgit v1.2.3