"ether.h" defines more than we need, and, on some platforms, redefines

ether_header (which is one of the things we don't need).  Just define
ETHER_ADDR_LEN to 6 if it's not defined - it can't be anything but 6.

diff --git a/addrtoname.c b/addrtoname.c
index 400dc7f34dad417e54b3ffd390dc67883d323342..ecb9f49fb4d5b713f0d1a4bf67fec5f3474b14bb 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -23,7 +23,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
  */
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.117 2006-02-27 07:17:34 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.118 2006-05-12 02:14:55 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -69,7 +69,7 @@ extern int ether_ntohost(char *, const struct ether_addr *);
 #include "oui.h"
 
 #ifndef ETHER_ADDR_LEN
 #include "oui.h"
 
 #ifndef ETHER_ADDR_LEN

-#include "ether.h"
+#define ETHER_ADDR_LEN 6

 #endif
 
 /*
 #endif
 
 /*