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/to_str.c | |
| parent | 6ef2cc2b1f65e7d6b02a7ac32bf0ae5dc0d29f5c (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>.
svn path=/trunk/; revision=5742
Diffstat (limited to 'epan/to_str.c')
| -rw-r--r-- | epan/to_str.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/to_str.c b/epan/to_str.c index 642b0e26b7..6ea8d125b0 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -1,7 +1,7 @@ /* to_str.c * Routines for utilities to convert various other types to strings. * - * $Id: to_str.c,v 1.13 2001/09/14 07:23:33 guy Exp $ + * $Id: to_str.c,v 1.14 2002/06/23 10:32:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -33,8 +33,8 @@ # include <sys/types.h> #endif -#ifdef HAVE_WINSOCK_H -# include <winsock.h> /* for "u_char" */ +#ifdef HAVE_WINSOCK2_H +# include <winsock2.h> /* for "u_char" */ #endif #ifdef NEED_SNPRINTF_H |