aboutsummaryrefslogtreecommitdiffstats
path: root/nametoaddr.c
diff options
context:
space:
mode:
authorguy <guy>2002-08-02 05:53:53 +0000
committerguy <guy>2002-08-02 05:53:53 +0000
commitbf6b573fc3a55b0c1d1388aed9f48438d7881482 (patch)
treec85f3b91f914bf562528861bc143bb386c57a85d /nametoaddr.c
parentf66b87464f1997a6bbb8f84f25d9cf53cf972b5f (diff)
Include "IP6_misc.h" even on UNIX if __MINGW32__ is defined, as had
been the case before the previous checkin.
Diffstat (limited to 'nametoaddr.c')
-rw-r--r--nametoaddr.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/nametoaddr.c b/nametoaddr.c
index 6128666..de2d7af 100644
--- a/nametoaddr.c
+++ b/nametoaddr.c
@@ -24,7 +24,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.66 2002-08-02 03:44:20 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.67 2002-08-02 05:53:53 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -34,9 +34,6 @@ static const char rcsid[] =
#ifdef WIN32
#include <pcap-stdinc.h>
-#ifdef __MINGW32__
-#include "IP6_misc.h"
-#endif
#else /* WIN32 */
#include <sys/param.h>
@@ -45,6 +42,16 @@ static const char rcsid[] =
#include <sys/time.h>
#include <netinet/in.h>
+#endif /* WIN32 */
+
+/*
+ * XXX - why was this included even on UNIX?
+ */
+#ifdef __MINGW32__
+#include "IP6_misc.h"
+#endif
+
+#ifndef WIN32
#ifdef HAVE_ETHER_HOSTTON
#ifdef HAVE_NETINET_IF_ETHER_H
struct mbuf; /* Squelch compiler warnings on some platforms for */