summaryrefslogtreecommitdiffstats
path: root/netrom
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-08-10 05:54:53 +0200
committerRalf Baechle <ralf@linux-mips.org>1999-08-10 05:54:53 +0200
commita4cc50373fbe27c973f95628fc142efec14e05cf (patch)
treebc163bed95c61b53f1399cb27e1fe9dd60bb6b4f /netrom
parent5f5d1604492ae15967f9d86f41fbeeedcae0ae2b (diff)
Import ax25-tools 0.0.4 from tarballax25-tools-0.0.4
Diffstat (limited to 'netrom')
-rw-r--r--netrom/Makefile.in5
-rw-r--r--netrom/netromd.c6
-rw-r--r--netrom/netromr.c5
3 files changed, 12 insertions, 4 deletions
diff --git a/netrom/Makefile.in b/netrom/Makefile.in
index e909d4e..4dc6975 100644
--- a/netrom/Makefile.in
+++ b/netrom/Makefile.in
@@ -61,6 +61,7 @@ AWK = @AWK@
AX25IO_LIB = @AX25IO_LIB@
AX25_LIB = @AX25_LIB@
CC = @CC@
+DMASCC = @DMASCC@
MAKEINFO = @MAKEINFO@
NCURSES_LIB = @NCURSES_LIB@
PACKAGE = @PACKAGE@
@@ -97,10 +98,6 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
netromd_OBJECTS = netromd.o netromr.o netromt.o
netromd_LDADD = $(LDADD)
netromd_DEPENDENCIES =
diff --git a/netrom/netromd.c b/netrom/netromd.c
index 15fc0e4..dec779d 100644
--- a/netrom/netromd.c
+++ b/netrom/netromd.c
@@ -15,7 +15,13 @@
#include <netinet/in.h>
#include <net/if.h>
+
+#ifdef __GLIBC__
#include <net/ethernet.h>
+#else
+#include <linux/if_ether.h>
+#endif
+
#ifdef HAVE_NETAX25_AX25_H
#include <netax25/ax25.h>
#else
diff --git a/netrom/netromr.c b/netrom/netromr.c
index 3ba7c33..5b99acc 100644
--- a/netrom/netromr.c
+++ b/netrom/netromr.c
@@ -13,7 +13,12 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <net/if.h>
+
+#ifdef __GLIBC__
#include <net/ethernet.h>
+#else
+#include <linux/if_ether.h>
+#endif
#ifdef HAVE_NETAX25_AX25_H
#include <netax25/ax25.h>