dect
/
libpcap
Archived
13
0
Fork 0
Code Releases Activity

Include "IP6_misc.h" even on UNIX if __MINGW32__ is defined, as had 

been the case before the previous checkin.
This commit is contained in:
guy 2002-08-02 05:53:53 +00:00
parent f66b87464f
commit bf6b573fc3
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gencode.c
View File

@ -21,7 +21,7 @@
*/
#ifndef lint
static const char rcsid[] =
"@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.171 2002-08-02 03:44:19 guy Exp $ (LBL)";
"@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.172 2002-08-02 05:53:53 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@ -30,16 +30,21 @@ static const char rcsid[] =
#ifdef WIN32
#include <pcap-stdinc.h>
#else /* WIN32 */
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
#endif /* WIN32 */
/*
* XXX - why was this included even on UNIX?
*/
#ifdef __MINGW32__
#include "IP6_misc.h"
#endif
#else /* WIN32 */
#ifndef WIN32
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
#ifdef __NetBSD__
#include <sys/param.h>
#endif
@ -69,11 +74,11 @@ struct rtentry; /* declarations in <net/if.h> */
#include "ppp.h"
#include "sll.h"
#include "arcnet.h"
#ifndef WIN32
#ifdef INET6
#ifndef WIN32
#include <netdb.h> /* for "struct addrinfo" */
#endif /*INET6*/
#endif /* WIN32 */
#endif /*INET6*/
#include <pcap-namedb.h>
#define ETHERMTU 1500

15
nametoaddr.c
View File

@ -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 */