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/proto.h | |
| 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/proto.h')
| -rw-r--r-- | epan/proto.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/proto.h b/epan/proto.h index ae1a9521ba..fe34faf64e 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -1,7 +1,7 @@ /* proto.h * Definitions for protocol display * - * $Id: proto.h,v 1.32 2002/05/14 10:15:10 guy Exp $ + * $Id: proto.h,v 1.33 2002/06/23 10:32:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -31,8 +31,8 @@ # include <varargs.h> #endif -#ifdef HAVE_WINSOCK_H -# include <winsock.h> +#ifdef HAVE_WINSOCK2_H +# include <winsock2.h> #endif #include <glib.h> |