Get rid of HAVE_FDDI cruft; FDDI is always included so the ifdef is extra.

diff --git a/Makefile.in b/Makefile.in
index 2b4833becae3ca9e629d8bbe519bd9cf65c88d8b..12ff18e5b86370dd9984882f6f54c70c4df50842 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,7 +17,7 @@
 #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.217 1999-12-04 20:10:00 mcr Exp $ (LBL)
+# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.218 1999-12-14 16:49:02 fenner Exp $ (LBL)

 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)


@@ -43,7 +43,7 @@ CC = @CC@
 PROG = tcpdump
 CCOPT = @V_CCOPT@
 INCLS = -I. @V_INCLS@
 PROG = tcpdump
 CCOPT = @V_CCOPT@
 INCLS = -I. @V_INCLS@

-DEFS = @DEFS@ -DHAVE_FDDI
+DEFS = @DEFS@

 
 # Standard CFLAGS
 CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
 
 # Standard CFLAGS
 CFLAGS = $(CCOPT) $(DEFS) $(INCLS)

diff --git a/print-fddi.c b/print-fddi.c
index 30da1c26b87b7a423f5916d2d7d51748a40b9924..858dfb5ae7b52d95ba0429eb4f4f6d7356d5240a 100644 (file)
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -21,14 +21,13 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.39 1999-11-21 09:36:52 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.40 1999-12-14 16:49:02 fenner Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#ifdef HAVE_FDDI

 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/socket.h>


@@ -339,19 +338,3 @@ fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h,
 out:
        putchar('\n');
 }
 out:
        putchar('\n');
 }

-#else
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <stdio.h>
-
-#include "interface.h"
-void
-fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h,
-             register const u_char *p)
-{
-
-       error("not configured for fddi");
-       /* NOTREACHED */
-}
-#endif