aboutsummaryrefslogtreecommitdiffstats
path: root/config.h.win32
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2002-06-23 10:32:36 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2002-06-23 10:32:36 +0000
commitbfd26685687386cb09c5f6b2a71257677d489a89 (patch)
tree8ec2f7762a234f23f5b362bf99e86c209e43195a /config.h.win32
parentb2560416c80ac31b6658de7966e8baa81f98c0e6 (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 'config.h.win32')
-rw-r--r--config.h.win324
1 files changed, 2 insertions, 2 deletions
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