summaryrefslogtreecommitdiffstats
path: root/ax25
diff options
context:
space:
mode:
Diffstat (limited to 'ax25')
-rw-r--r--ax25/ax25d.c14
-rw-r--r--ax25/axctl.c8
-rw-r--r--ax25/axparms.c8
-rw-r--r--ax25/axspawn.c10
-rw-r--r--ax25/beacon.c8
-rw-r--r--ax25/mheard.c8
-rw-r--r--ax25/mheardd.c8
-rw-r--r--ax25/rxecho.c8
8 files changed, 2 insertions, 70 deletions
diff --git a/ax25/ax25d.c b/ax25/ax25d.c
index 63ec5d2..126ec39 100644
--- a/ax25/ax25d.c
+++ b/ax25/ax25d.c
@@ -1,5 +1,5 @@
/*
- * $Id: ax25d.c,v 1.7 2009/06/14 16:25:26 ralf Exp $
+ * $Id: ax25d.c,v 1.8 2009/06/21 18:01:55 ralf Exp $
*
* This is my version of axl.c, written for the LBBS code to make it
* compatable with the kernel AX25 driver. It appears to work, with
@@ -130,21 +130,9 @@
#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_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>
#include <netax25/axconfig.h>
diff --git a/ax25/axctl.c b/ax25/axctl.c
index 6f94650..e198e97 100644
--- a/ax25/axctl.c
+++ b/ax25/axctl.c
@@ -12,16 +12,8 @@
#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/ax25/axparms.c b/ax25/axparms.c
index 141ceb2..daac7d4 100644
--- a/ax25/axparms.c
+++ b/ax25/axparms.c
@@ -13,16 +13,8 @@
#include <net/if.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/ax25/axspawn.c b/ax25/axspawn.c
index 0769353..42c8957 100644
--- a/ax25/axspawn.c
+++ b/ax25/axspawn.c
@@ -1,6 +1,6 @@
/*
*
- * $Id: axspawn.c,v 1.21 2009/06/14 16:25:26 ralf Exp $
+ * $Id: axspawn.c,v 1.22 2009/06/21 18:01:55 ralf Exp $
*
* axspawn.c - run a program from ax25d.
*
@@ -171,16 +171,8 @@
#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>
diff --git a/ax25/beacon.c b/ax25/beacon.c
index da6f68d..095614f 100644
--- a/ax25/beacon.c
+++ b/ax25/beacon.c
@@ -9,16 +9,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/ax25/mheard.c b/ax25/mheard.c
index 6b3f21a..5aeacf4 100644
--- a/ax25/mheard.c
+++ b/ax25/mheard.c
@@ -8,16 +8,8 @@
#include <config.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/mheard.h>
diff --git a/ax25/mheardd.c b/ax25/mheardd.c
index 31f9f64..3d45131 100644
--- a/ax25/mheardd.c
+++ b/ax25/mheardd.c
@@ -24,16 +24,8 @@
#include <netinet/in.h>
#include <config.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>
diff --git a/ax25/rxecho.c b/ax25/rxecho.c
index e299f2c..7acb156 100644
--- a/ax25/rxecho.c
+++ b/ax25/rxecho.c
@@ -106,16 +106,8 @@
#include <netinet/in.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>