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

19 files changed, 54 insertions, 55 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>
diff --git a/config.h.win32 b/config.h.win32
index 5396ba6a76..5954d429ac 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.34 2002/03/12 10:37:01 guy Exp $ */
+/* $Id: config.h.win32,v 1.35 2002/06/23 10:32:11 guy Exp $ */
 /* config.h.win32 Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -113,7 +113,7 @@
 #endif
 
 #define HAVE_WINDOWS_H		1
-#define HAVE_WINSOCK_H		1
+#define HAVE_WINSOCK2_H		1
 #define HAVE_DIRECT_H		1
 #define HAVE_IO_H		1
 #define NEED_INET_ATON_H	1
diff --git a/editcap.c b/editcap.c
index 16fa5488b4..d2d684043c 100644
--- a/editcap.c
+++ b/editcap.c
@@ -1,7 +1,7 @@
 /* Edit capture files.  We can delete records, adjust timestamps, or
  * simply convert from one format to another format.
  *
- * $Id: editcap.c,v 1.22 2002/03/31 20:39:08 guy Exp $
+ * $Id: editcap.c,v 1.23 2002/06/23 10:32:13 guy Exp $
  *
  * Originally written by Richard Sharpe.
  * Improved by Guy Harris.
@@ -24,8 +24,8 @@
 #include <sys/time.h>
 #endif
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
 #endif
 
 #include <string.h>
diff --git a/epan/config.h.win32 b/epan/config.h.win32
index 857af2d019..9733e2d1cb 100644
--- a/epan/config.h.win32
+++ b/epan/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.9 2001/10/28 00:57:15 guy Exp $ */
+/* $Id: config.h.win32,v 1.10 2002/06/23 10:32:32 guy Exp $ */
 /* config.h.win32 Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -79,7 +79,7 @@
 #endif
 
 #define HAVE_WINDOWS_H		1
-#define HAVE_WINSOCK_H		1
+#define HAVE_WINSOCK2_H		1
 #define HAVE_DIRECT_H		1
 #define HAVE_IO_H		1
 #define NEED_GETOPT_H		1
diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h
index 82f13471ea..5589147fb9 100644
--- a/epan/ftypes/ftypes.h
+++ b/epan/ftypes/ftypes.h
@@ -1,7 +1,7 @@
 /* ftypes.h
  * Definitions for field types
  *
- * $Id: ftypes.h,v 1.10 2002/05/09 23:50:32 gram Exp $
+ * $Id: ftypes.h,v 1.11 2002/06/23 10:32:35 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -113,8 +113,8 @@ ftype_can_le(enum ftenum ftype);
 
 #include <epan/ipv4.h>
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
 #endif
 
 #include <epan/tvbuff.h>
diff --git a/epan/inet_aton.c b/epan/inet_aton.c
index 0ee19c6ab8..f101d10cd1 100644
--- a/epan/inet_aton.c
+++ b/epan/inet_aton.c
@@ -47,8 +47,8 @@ static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
 #include <netinet/in.h>
 #endif
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
 #endif
 
 #ifdef HAVE_ARPA_INET_H
diff --git a/epan/inet_ntop.c b/epan/inet_ntop.c
index 0f50bc761a..e2cfa13595 100644
--- a/epan/inet_ntop.c
+++ b/epan/inet_ntop.c
@@ -20,7 +20,7 @@
 #endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: inet_ntop.c,v 1.2 2001/10/28 01:55:10 guy Exp $";
+static char rcsid[] = "$Id: inet_ntop.c,v 1.3 2002/06/23 10:32:32 guy Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #ifdef HAVE_SYS_PARAM_H
@@ -35,8 +35,8 @@ static char rcsid[] = "$Id: inet_ntop.c,v 1.2 2001/10/28 01:55:10 guy Exp $";
 #include <sys/socket.h>
 #endif
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
 #define EAFNOSUPPORT    WSAEAFNOSUPPORT
 #endif
 
diff --git a/epan/inet_pton.c b/epan/inet_pton.c
index 014f096b52..07d7c1af7c 100644
--- a/epan/inet_pton.c
+++ b/epan/inet_pton.c
@@ -20,7 +20,7 @@
 #endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: inet_pton.c,v 1.1 2000/10/14 04:31:26 gram Exp $";
+static char rcsid[] = "$Id: inet_pton.c,v 1.2 2002/06/23 10:32:32 guy Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #ifdef HAVE_SYS_PARAM_H
@@ -31,8 +31,8 @@ static char rcsid[] = "$Id: inet_pton.c,v 1.1 2000/10/14 04:31:26 gram Exp $";
 #include <sys/types.h>
 #endif
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
 #define EAFNOSUPPORT	WSAEAFNOSUPPORT
 #endif
 
diff --git a/epan/packet.c b/epan/packet.c
index 0de8327619..d6a01b748d 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -1,7 +1,7 @@
 /* packet.c
  * Routines for packet disassembly
  *
- * $Id: packet.c,v 1.72 2002/06/04 07:03:54 guy Exp $
+ * $Id: packet.c,v 1.73 2002/06/23 10:32:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -34,8 +34,8 @@
 #include <sys/socket.h>
 #endif
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
 #endif
 
 #include <glib.h>
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>
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,
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
diff --git a/in_cksum.c b/in_cksum.c
index 2ab7dd36f8..62b729875e 100644
--- a/in_cksum.c
+++ b/in_cksum.c
@@ -2,7 +2,7 @@
  * 4.4-Lite-2 Internet checksum routine, modified to take a vector of
  * pointers/lengths giving the pieces to be checksummed.
  *
- * $Id: in_cksum.c,v 1.4 2001/06/09 01:02:29 guy Exp $
+ * $Id: in_cksum.c,v 1.5 2002/06/23 10:32:14 guy Exp $
  */
 
 /*
@@ -52,8 +52,8 @@
 #include <arpa/inet.h>
 #endif
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
 #endif
 
 #include <glib.h>
diff --git a/mergecap.c b/mergecap.c
index 74902a60c1..e51ffc4869 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -1,6 +1,6 @@
 /* Combine two dump files, either by appending or by merging by timestamp
  *
- * $Id: mergecap.c,v 1.8 2002/03/31 20:59:47 guy Exp $
+ * $Id: mergecap.c,v 1.9 2002/06/23 10:32:16 guy Exp $
  *
  * Written by Scott Renfro <scott@renfro.org> based on
  * editcap by Richard Sharpe and Guy Harris
@@ -23,8 +23,8 @@
 #include <sys/time.h>
 #endif
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
 #endif
 
 #include <string.h>
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>
diff --git a/wiretap/buffer.h b/wiretap/buffer.h
index b742e3eb44..a3eaa929bd 100644
--- a/wiretap/buffer.h
+++ b/wiretap/buffer.h
@@ -1,6 +1,6 @@
 /* buffer.h
  *
- * $Id: buffer.h,v 1.8 2001/11/13 23:55:43 gram Exp $
+ * $Id: buffer.h,v 1.9 2002/06/23 10:32:36 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -26,8 +26,8 @@
 
 #define SOME_FUNCTIONS_ARE_DEFINES
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>        /* to define u_char */
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>        /* to define u_char */
 #endif
 
 typedef struct Buffer {
diff --git a/wiretap/config.h.win32 b/wiretap/config.h.win32
index bd7cf51db6..f9b8b7846c 100644
--- a/wiretap/config.h.win32
+++ b/wiretap/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.9 2002/06/10 15:45:30 gram Exp $ */
+/* $Id: config.h.win32,v 1.10 2002/06/23 10:32:36 guy Exp $ */
 /* config.h.win32 Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -44,7 +44,7 @@
 /* Version number of package */
 #define VERSION "@VERSION@"
 
-#define HAVE_WINSOCK_H		1
+#define HAVE_WINSOCK2_H		1
 #define HAVE_IO_H		1
 #define open                    _open
 #define close                   _close
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index d36f1ed37d..49bad795bf 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -1,6 +1,6 @@
 /* wtap-int.h
  *
- * $Id: wtap-int.h,v 1.24 2002/04/08 09:09:49 guy Exp $
+ * $Id: wtap-int.h,v 1.25 2002/06/23 10:32:36 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -31,8 +31,8 @@
 #include <sys/time.h>
 #endif
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
 #endif
 
 #include <glib.h>
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index edd90ef01f..aee32cefc1 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1,6 +1,6 @@
 /* wtap.h
  *
- * $Id: wtap.h,v 1.114 2002/06/07 21:11:24 guy Exp $
+ * $Id: wtap.h,v 1.115 2002/06/23 10:32:36 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -162,8 +162,8 @@
 #include <sys/time.h>
 #endif
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
 #endif
 
 #include <glib.h>