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 /text2pcap.c | |
| 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 'text2pcap.c')
| -rw-r--r-- | text2pcap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/text2pcap.c b/text2pcap.c index 5814a959d4..1fa2084a89 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -6,7 +6,7 @@ * * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com> * - * $Id: text2pcap.c,v 1.16 2002/04/15 21:53:55 guy Exp $ + * $Id: text2pcap.c,v 1.17 2002/06/23 10:32:18 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -101,8 +101,8 @@ #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif -#ifdef HAVE_WINSOCK_H -# include <winsock.h> +#ifdef HAVE_WINSOCK2_H +# include <winsock2.h> #endif #include <errno.h> #include <assert.h> |