Get rid of some includes of <net/route.h>, and empty declarations of

"struct mbuf" and "struct rtentry" - they shouldn't be necessary (and
weren't on the platforms on which I tested, both with GCC and the native
compiler if it isn't GCC).

diff --git a/print-ah.c b/print-ah.c
index 1bd1895467a4233827c885a088610f740ed938dd..173132eb42106ca0c7abae6d91c1269d43708e07 100644 (file)
--- a/print-ah.c
+++ b/print-ah.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.11 2000-10-03 02:19:04 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.12 2000-10-06 04:23:10 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -35,8 +35,6 @@ static const char rcsid[] =
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <net/route.h>
-
 #include <netinet/in.h>
 
 #include <stdio.h>

diff --git a/print-atalk.c b/print-atalk.c
index fd75f756dc37be71390e1385fc9ce11febd8512e..b5d162c720a18818be39550cf323a7a289f8eda8 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.60 2000-10-05 04:10:01 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.61 2000-10-06 04:23:10 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,11 +34,6 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-
 #include <netinet/in.h>
 
 #include <stdio.h>

diff --git a/print-atm.c b/print-atm.c
index 43d2d93388ebba3a3e670b9ac2b8ec64c91c79b4..2407b48000a91e069f1be3b2f6601ef711ccff1f 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.18 2000-09-29 04:58:34 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.19 2000-10-06 04:23:10 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -31,9 +31,6 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-struct mbuf;
-struct rtentry;
-
 #include <netinet/in.h>
 
 #include <stdio.h>

diff --git a/print-domain.c b/print-domain.c
index 7bbe1d1ae695209ed6d411bf1044bbd4278881b4..b42e09219cb137716c77fe19b5b658a42ebaef7b 100644 (file)
--- a/print-domain.c
+++ b/print-domain.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.53 2000-10-03 09:13:25 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.54 2000-10-06 04:23:11 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,9 +32,6 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-struct mbuf;
-struct rtentry;
-
 #include <netinet/in.h>
 
 #ifdef NOERROR

diff --git a/print-esp.c b/print-esp.c
index f212b7440780fa06c13b99d9ce7362b846ef4325..9090ffca3a73128af171e81f16ae24f454477637 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.13 2000-10-03 02:54:58 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.14 2000-10-06 04:23:11 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -36,8 +36,6 @@ static const char rcsid[] =
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <net/route.h>
-
 #include <netinet/in.h>
 
 #ifdef HAVE_LIBCRYPTO

diff --git a/print-fddi.c b/print-fddi.c
index 98a492c494a5a6f5bd02dfac29c7c8133768f885..92afbdfa04f5ce92db35f35c0ed59fbd3525b449 100644 (file)
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.45 2000-09-29 04:58:38 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.46 2000-10-06 04:23:11 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,9 +34,6 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
-struct mbuf;
-struct rtentry;
-
 #include <netinet/in.h>
 
 #include <ctype.h>

diff --git a/print-ipcomp.c b/print-ipcomp.c
index 39739311a047f441fa24598e2b4f0867e1a0fba1..1e8936ffe438cdd8e843bcfb9d76f93e6f1d5cd3 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.10 2000-10-03 02:19:06 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.11 2000-10-06 04:23:12 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,8 +34,6 @@ static const char rcsid[] =
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <net/route.h>
-
 #include <netinet/in.h>
 
 #include <stdio.h>

diff --git a/print-isoclns.c b/print-isoclns.c
index a1b5678115ec80519b2cdafafdec330ac70df8bc..f54a26b13b1f02609f27394a3916799310f3499b 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.19 2000-09-28 06:43:02 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.20 2000-10-06 04:23:12 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,9 +34,6 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-struct mbuf;
-struct rtentry;
-
 #include <netinet/in.h>
 
 #include <stdio.h>

diff --git a/print-lcp.c b/print-lcp.c
index 442067b6981cfbfc4c620d86b33e1a0c00fa4aee..06346025bab0e5c27b31c14532d068e3f17133ec 100644 (file)
--- a/print-lcp.c
+++ b/print-lcp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-"@(#) $Header: /tcpdump/master/tcpdump/Attic/print-lcp.c,v 1.8 2000-09-28 06:43:02 guy Exp $ (LBL)";
+"@(#) $Header: /tcpdump/master/tcpdump/Attic/print-lcp.c,v 1.9 2000-10-06 04:23:12 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,9 +32,6 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-struct mbuf;
-struct rtentry;
-
 #include <netinet/in.h>
 
 #include <stdio.h>

diff --git a/print-ntp.c b/print-ntp.c
index 924b7075f1dda8f60dff51939a47be631d6b44d2..6ae709e8ad87db13beaea226f9daf522051658a1 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.30 2000-09-28 06:43:04 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.31 2000-10-06 04:23:13 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -36,9 +36,6 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-struct mbuf;
-struct rtentry;
-
 #include <netinet/in.h>
 
 #include <ctype.h>

diff --git a/print-pppoe.c b/print-pppoe.c
index 5b846c15138ee3e453a4e493580a68beb657e80b..dd8ad24b1a65ae3550f69bdfceea74693cd9464b 100644 (file)
--- a/print-pppoe.c
+++ b/print-pppoe.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.10 2000-10-05 04:10:03 itojun Exp $ (LBL)";
+"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.11 2000-10-06 04:23:13 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,9 +32,6 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-struct mbuf;
-struct rtentry;
-
 #include <netinet/in.h>
 
 #include <stdio.h>

diff --git a/print-raw.c b/print-raw.c
index a293c3d025f536fd275a003598f4d9ad2dd74e9e..7502394ab9ba8ada5bc8d28abe004cc19b2978d6 100644 (file)
--- a/print-raw.c
+++ b/print-raw.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.32 2000-09-29 04:58:47 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.33 2000-10-06 04:23:13 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,9 +34,6 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
-struct mbuf;
-struct rtentry;
-
 #include <netinet/in.h>
 
 #include <pcap.h>
@@ -46,10 +43,6 @@ struct rtentry;
 #include "addrtoname.h"
 #include "interface.h"
 
-#ifndef AF_NS
-#define AF_NS          6               /* XEROX NS protocols */
-#endif
-
 /*
  * The DLT_RAW packet has no header. It contains a raw IP packet.
  */

diff --git a/print-token.c b/print-token.c
index 8c5b63a1da93b6327decf48bc39156a969912ab3..156c61091f176fff6cf586f238613e6065f1a5d4 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -25,7 +25,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.7 2000-10-03 04:19:08 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.8 2000-10-06 04:23:14 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -36,9 +36,6 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-struct mbuf;
-struct rtentry;
-
 #include <netinet/in.h>
 
 #include <pcap.h>