diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-06-23 10:32:36 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-06-23 10:32:36 +0000 |
| commit | 73ef5a2753c0c585f45b0f1ba014e455907d417f (patch) | |
| tree | 8ec2f7762a234f23f5b362bf99e86c209e43195a /epan/inet_pton.c | |
| parent | 6ef2cc2b1f65e7d6b02a7ac32bf0ae5dc0d29f5c (diff) | |
| download | wireshark-73ef5a2753c0c585f45b0f1ba014e455907d417f.tar.gz | |
WinPcap 2.3's <pcap.h> includes <packet32.h>, and WinPcap 2.3's
<packet32.h> includes <winsock2.h>; we include that rather than
<winsock.h>, to avoid errors due to conflicting declarations in
<winsock.h> and <winsock2.h>.
svn path=/trunk/; revision=5742
Diffstat (limited to 'epan/inet_pton.c')
| -rw-r--r-- | epan/inet_pton.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/inet_pton.c b/epan/inet_pton.c index 014f096b52..07d7c1af7c 100644 --- a/epan/inet_pton.c +++ b/epan/inet_pton.c @@ -20,7 +20,7 @@ #endif #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$Id: inet_pton.c,v 1.1 2000/10/14 04:31:26 gram Exp $"; +static char rcsid[] = "$Id: inet_pton.c,v 1.2 2002/06/23 10:32:32 guy Exp $"; #endif /* LIBC_SCCS and not lint */ #ifdef HAVE_SYS_PARAM_H @@ -31,8 +31,8 @@ static char rcsid[] = "$Id: inet_pton.c,v 1.1 2000/10/14 04:31:26 gram Exp $"; #include <sys/types.h> #endif -#ifdef HAVE_WINSOCK_H -#include <winsock.h> +#ifdef HAVE_WINSOCK2_H +#include <winsock2.h> #define EAFNOSUPPORT WSAEAFNOSUPPORT #endif |