summaryrefslogtreecommitdiffstats
path: root/ax25rtd
diff options
context:
space:
mode:
Diffstat (limited to 'ax25rtd')
-rw-r--r--ax25rtd/ax25rtd.c12
-rw-r--r--ax25rtd/cache_ctl.c6
-rw-r--r--ax25rtd/cache_dump.c10
-rw-r--r--ax25rtd/config.c6
-rw-r--r--ax25rtd/listener.c6
5 files changed, 8 insertions, 32 deletions
diff --git a/ax25rtd/ax25rtd.c b/ax25rtd/ax25rtd.c
index 4d22c47..7180640 100644
--- a/ax25rtd/ax25rtd.c
+++ b/ax25rtd/ax25rtd.c
@@ -1,4 +1,4 @@
-/* $Id: ax25rtd.c,v 1.6 2009/06/14 16:25:33 ralf Exp $
+/* $Id: ax25rtd.c,v 1.7 2009/06/21 18:01:57 ralf Exp $
*
* Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com)
*
@@ -50,23 +50,15 @@
#include <linux/if_ether.h>
#endif
-#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/axconfig.h>
#include <netax25/axlib.h>
#include "../pathnames.h"
#include "ax25rtd.h"
-const char *Version = "ax25rtd $Revision: 1.6 $";
+const char *Version = "ax25rtd $Revision: 1.7 $";
config *Config = NULL;
int reload = 0;
diff --git a/ax25rtd/cache_ctl.c b/ax25rtd/cache_ctl.c
index 1f435b5..e6abb42 100644
--- a/ax25rtd/cache_ctl.c
+++ b/ax25rtd/cache_ctl.c
@@ -1,4 +1,4 @@
-/* $Id: cache_ctl.c,v 1.2 2001/09/12 13:18:43 terry Exp $
+/* $Id: cache_ctl.c,v 1.3 2009/06/21 18:01:57 ralf Exp $
*
* Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com)
*
@@ -24,11 +24,7 @@
#include <sys/socket.h>
#include <config.h>
-#ifdef HAVE_NETAX25_AX25_H
#include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
#include "ax25rtd.h"
diff --git a/ax25rtd/cache_dump.c b/ax25rtd/cache_dump.c
index 64cb8dd..b8e6c47 100644
--- a/ax25rtd/cache_dump.c
+++ b/ax25rtd/cache_dump.c
@@ -1,4 +1,4 @@
-/* $Id: cache_dump.c,v 1.2 2001/09/12 13:18:43 terry Exp $
+/* $Id: cache_dump.c,v 1.3 2009/06/21 18:01:57 ralf Exp $
*
* Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com)
*
@@ -27,16 +27,8 @@
#include <sys/socket.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>
#include "ax25rtd.h"
diff --git a/ax25rtd/config.c b/ax25rtd/config.c
index f557456..9e3e678 100644
--- a/ax25rtd/config.c
+++ b/ax25rtd/config.c
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.5 2009/06/14 08:08:26 ralf Exp $
+/* $Id: config.c,v 1.6 2009/06/21 18:01:57 ralf Exp $
*
* Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com)
*
@@ -38,8 +38,8 @@
#include <net/if_arp.h>
#include <config.h>
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
#include <netax25/axlib.h>
#include <netax25/axconfig.h>
diff --git a/ax25rtd/listener.c b/ax25rtd/listener.c
index 051d8c9..7bbb710 100644
--- a/ax25rtd/listener.c
+++ b/ax25rtd/listener.c
@@ -1,4 +1,4 @@
-/* $Id: listener.c,v 1.6 2009/06/14 16:25:33 ralf Exp $
+/* $Id: listener.c,v 1.7 2009/06/21 18:01:57 ralf Exp $
*
* Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com)
*
@@ -39,11 +39,7 @@
#include <net/if.h>
#include <net/if_arp.h>
-#ifdef HAVE_NETAX25_AX25_H
#include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
#include "../pathnames.h"
#include "ax25rtd.h"