aboutsummaryrefslogtreecommitdiffstats
path: root/asn1.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2002-06-23 10:32:36 +0000
committerGuy Harris <guy@alum.mit.edu>2002-06-23 10:32:36 +0000
commit73ef5a2753c0c585f45b0f1ba014e455907d417f (patch)
tree8ec2f7762a234f23f5b362bf99e86c209e43195a /asn1.c
parent6ef2cc2b1f65e7d6b02a7ac32bf0ae5dc0d29f5c (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 'asn1.c')
-rw-r--r--asn1.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/asn1.c b/asn1.c
index e39bee2c91..fae948743c 100644
--- a/asn1.c
+++ b/asn1.c
@@ -1,7 +1,7 @@
/* asn1.c
* Routines for ASN.1 BER dissection
*
- * $Id: asn1.c,v 1.14 2002/06/16 00:53:17 guy Exp $
+ * $Id: asn1.c,v 1.15 2002/06/23 10:32:07 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -66,8 +66,8 @@
# include <sys/types.h>
#endif
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
#endif
#include <limits.h>