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_aton.c | |
| parent | 6ef2cc2b1f65e7d6b02a7ac32bf0ae5dc0d29f5c (diff) | |
| download | wireshark-73ef5a2753c0c585f45b0f1ba014e455907d417f.tar.gz wireshark-73ef5a2753c0c585f45b0f1ba014e455907d417f.tar.bz2 wireshark-73ef5a2753c0c585f45b0f1ba014e455907d417f.zip | |
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_aton.c')
| -rw-r--r-- | epan/inet_aton.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/inet_aton.c b/epan/inet_aton.c index 0ee19c6ab8..f101d10cd1 100644 --- a/epan/inet_aton.c +++ b/epan/inet_aton.c @@ -47,8 +47,8 @@ static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93"; #include <netinet/in.h> #endif -#ifdef HAVE_WINSOCK_H -#include <winsock.h> +#ifdef HAVE_WINSOCK2_H +#include <winsock2.h> #endif #ifdef HAVE_ARPA_INET_H |