summaryrefslogtreecommitdiffstats
path: root/ax25
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2017-01-27 14:52:45 +0100
committerRalf Baechle <ralf@linux-mips.org>2017-02-06 23:43:46 +0100
commit29b76dcd83a9e1068f4835a8540b2e22314a0abb (patch)
tree3395eadc64c09b0b97e37fe5b9347bb3bed851bb /ax25
parentbb9279493ef43242a5be0b96c79065f874c1ae7a (diff)
Remove support for !defined(__GLIBC__) and __GLIBC__ != 2.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'ax25')
-rw-r--r--ax25/bpqparms.c2
-rw-r--r--ax25/mheardd.c4
-rw-r--r--ax25/rxecho.c8
3 files changed, 0 insertions, 14 deletions
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>