Propagate

	revision 1.118
	date: 2006-05-11 19:14:55 -0700;  author: guy;  state: Exp;  lines: +2 -2
	"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.

to the x.9 branch, to fix build problems on Solaris.

diff --git a/addrtoname.c b/addrtoname.c
index 8399472bb07f004cc3fc7d2acabdaa98e7282a09..7e451cc2f3c7fbf3d325223e3cb65fb085e7ba34 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -23,7 +23,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.108.2.8 2006-02-27 07:27:16 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.108.2.9 2007-09-14 00:26:18 guy Exp $ (LBL)";
 #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 "ether.h"
+#define ETHER_ADDR_LEN 6
 #endif
 
 /*
@@ -515,7 +515,7 @@ linkaddr_string(const u_char *ep, const unsigned int len)
        register char *cp;
        register struct enamemem *tp;
 
-       if (len == 6)   /* XXX not totally correct... */
+       if (len == ETHER_ADDR_LEN)      /* XXX not totally correct... */
                return etheraddr_string(ep);
 
        tp = lookup_bytestring(ep, len);