From 616dec9df4d1e704d6fe6c69383d3b8f930345bf Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sun, 21 Jun 2009 18:01:55 +0000
Subject: Remove use of backwards compatibility header name.

Glibc as old as 2.2 provides working headers under the right name and
if not libax25 would install headers under the right name so this has
become redundant and ugly.
---
 rose/rsattach.c | 12 ------------
 rose/rsdwnlnk.c |  8 --------
 rose/rsparms.c  |  8 --------
 rose/rsuplnk.c  |  8 --------
 4 files changed, 36 deletions(-)

(limited to 'rose')

diff --git a/rose/rsattach.c b/rose/rsattach.c
index b7323e1..924d152 100644
--- a/rose/rsattach.c
+++ b/rose/rsattach.c
@@ -19,21 +19,9 @@
 /* #include <linux/sockios.h> */
 
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 
diff --git a/rose/rsdwnlnk.c b/rose/rsdwnlnk.c
index decc06d..9ff6f31 100644
--- a/rose/rsdwnlnk.c
+++ b/rose/rsdwnlnk.c
@@ -11,16 +11,8 @@
 #include <sys/types.h>
 
 #include <sys/socket.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/rose/rsparms.c b/rose/rsparms.c
index 68e8481..95ef0ce 100644
--- a/rose/rsparms.c
+++ b/rose/rsparms.c
@@ -10,16 +10,8 @@
 #include <sys/ioctl.h>
 
 #include <sys/socket.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/rose/rsuplnk.c b/rose/rsuplnk.c
index 37c9484..eadb0ed 100644
--- a/rose/rsuplnk.c
+++ b/rose/rsuplnk.c
@@ -11,16 +11,8 @@
 #include <sys/types.h>
 
 #include <sys/socket.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
-- 
cgit v1.2.3