Windows build: #include winsock2.h only when needed.

[obnox/wireshark/wip.git] / capture_wpcap_packet.c

diff --git a/capture_wpcap_packet.c b/capture_wpcap_packet.c
index d26da5f8f4fdfb59f8d89d5186a47be468533db3..6729e0c8389bb563cb4bc6b3ea3b04d88ccc9307 100644 (file)
--- a/capture_wpcap_packet.c
+++ b/capture_wpcap_packet.c
@@ -34,7 +34,6 @@
 #include <glib.h>
 #include <gmodule.h>
 
-#include <wtap.h>
 #include <pcap.h>
 
 /* XXX - yes, I know, I should move cppmagic.h to a generic location. */
@@ -42,15 +41,23 @@
 
 #include <epan/value_string.h>
 
+#include <Packet32.h>
+#include <windows.h>
+#include <windowsx.h>
+#include <Ntddndis.h>
 
+#include "capture_wpcap_packet.h"
 
 /* packet32.h requires sockaddr_storage 
- * wether sockaddr_storage is defined or not depends on the Platform SDK 
+ * whether sockaddr_storage is defined or not depends on the Platform SDK 
  * version installed. The only one not defining it is the SDK that comes
  * with MSVC 6.0 (WINVER 0x0400).
  *
  * copied from RFC2553 (and slightly modified because of datatypes) ...
  * XXX - defined more than once, move this to a header file */
+#ifndef WINVER
+#error WINVER not defined ....
+#endif
 #if (WINVER <= 0x0400) && defined(_MSC_VER)
 typedef unsigned short eth_sa_family_t;
 
@@ -85,13 +92,6 @@ struct sockaddr_storage {
 #endif /* WINVER */
 
 
-#include <Packet32.h>
-#include <windows.h>
-#include <windowsx.h>
-#include <Ntddndis.h>
-
-#include "capture_wpcap_packet.h"
-
 gboolean has_wpacket = FALSE;