diff options
Diffstat (limited to 'Win32/Include/ip6_misc.h')
| -rw-r--r-- | Win32/Include/ip6_misc.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Win32/Include/ip6_misc.h b/Win32/Include/ip6_misc.h index bbeca07d..562fa618 100644 --- a/Win32/Include/ip6_misc.h +++ b/Win32/Include/ip6_misc.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /tcpdump/master/libpcap/Win32/Include/ip6_misc.h,v 1.5 2006/01/22 18:02:18 gianluca Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/Win32/Include/ip6_misc.h,v 1.5 2006-01-22 18:02:18 gianluca Exp $ (LBL) */ /* @@ -27,9 +27,7 @@ #include <winsock2.h> -#ifndef __MINGW32__ #include <ws2tcpip.h> -#endif /* __MINGW32__ */ #ifndef __MINGW32__ #define IN_MULTICAST(a) IN_CLASSD(a) @@ -39,7 +37,7 @@ #define IN_LOOPBACKNET 127 -#ifdef __MINGW32__ +#if defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF) /* IPv6 address */ struct in6_addr { @@ -60,12 +58,12 @@ struct in6_addr #endif /* __MINGW32__ */ -#if (defined WIN32) || (defined __MINGW32__) +#if (defined _MSC_VER) || (defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF)) typedef unsigned short sa_family_t; #endif -#ifdef __MINGW32__ +#if defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF) #define __SOCKADDR_COMMON(sa_prefix) \ sa_family_t sa_prefix##family @@ -149,7 +147,7 @@ struct sockaddr_in6 #define IP6OPT_MUTABLE 0x20 -#ifdef __MINGW32__ +#if defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF) #ifndef EAI_ADDRFAMILY struct addrinfo { int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ |