diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-06-23 10:32:36 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-06-23 10:32:36 +0000 |
| commit | bfd26685687386cb09c5f6b2a71257677d489a89 (patch) | |
| tree | 8ec2f7762a234f23f5b362bf99e86c209e43195a /wiretap/wtap-int.h | |
| parent | b2560416c80ac31b6658de7966e8baa81f98c0e6 (diff) | |
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>.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5742 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap/wtap-int.h')
| -rw-r--r-- | wiretap/wtap-int.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h index d36f1ed37d..49bad795bf 100644 --- a/wiretap/wtap-int.h +++ b/wiretap/wtap-int.h @@ -1,6 +1,6 @@ /* wtap-int.h * - * $Id: wtap-int.h,v 1.24 2002/04/08 09:09:49 guy Exp $ + * $Id: wtap-int.h,v 1.25 2002/06/23 10:32:36 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -31,8 +31,8 @@ #include <sys/time.h> #endif -#ifdef HAVE_WINSOCK_H -#include <winsock.h> +#ifdef HAVE_WINSOCK2_H +#include <winsock2.h> #endif #include <glib.h> |