From 73ef5a2753c0c585f45b0f1ba014e455907d417f Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Sun, 23 Jun 2002 10:32:36 +0000
Subject: 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
---
 epan/strutil.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'epan/strutil.h')

diff --git a/epan/strutil.h b/epan/strutil.h
index 6b3599c9db..f334cb7dd4 100644
--- a/epan/strutil.h
+++ b/epan/strutil.h
@@ -1,12 +1,11 @@
 /* strutil.h
  * String utility definitions
  *
- * $Id: strutil.h,v 1.6 2000/12/22 12:05:36 gram Exp $
+ * $Id: strutil.h,v 1.7 2002/06/23 10:32:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- *
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,8 +31,8 @@
 #include <sys/types.h>	/* for u_char */
 #endif
 
-#ifdef HAVE_WINSOCK_H
-# include <winsock.h>	/* for u_char */
+#ifdef HAVE_WINSOCK2_H
+# include <winsock2.h>	/* for u_char */
 #endif
 
 const u_char *find_line_end(const u_char *data, const u_char *dataend,
-- 
cgit v1.2.1