Fix for SVN #26535 so that building Wireshark with VC6 doesn't fail.
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 24 Oct 2008 22:13:09 +0000 (22:13 +0000)
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 24 Oct 2008 22:13:09 +0000 (22:13 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26545 f5534014-38df-0310-8fa8-9805f1628bb7

capture_wpcap_packet.c
gtk/capture_if_details_dlg_win32.c

index 6729e0c8389bb563cb4bc6b3ea3b04d88ccc9307..5da76ea9c996eca8c63cf9f19fee9b7e41a4586e 100644 (file)
 
 #include <epan/value_string.h>
 
-#include <Packet32.h>
-#include <windows.h>
+#include <winsock2.h>    /* Needed here to force a definition of WINVER           */
+                         /* for some (all ?) Microsoft compilers newer than vc6.  */
+                         /* (If windows.h were used instead, there might be       */
+                         /*  issues re winsock.h included before winsock2.h )     */
 #include <windowsx.h>
 #include <Ntddndis.h>
 
@@ -91,6 +93,7 @@ struct sockaddr_storage {
 /* ... copied from RFC2553 */
 #endif /* WINVER */
 
+#include <Packet32.h>
 
 gboolean has_wpacket = FALSE;
 
index d6c3f2318a759c3645115e011bfe445d638fad35..788101f1059e8686b3fe8d3670a3cb7f5be9a110 100644 (file)
 #include "gtk/gtkvumeter.h"
 #include "gtk/capture_if_details_dlg_win32.h"
 
-#include <Packet32.h>
-#include <windows.h>
+#include <winsock2.h>    /* Needed here to force a definition of WINVER           */
+                         /* for some (all ?) Microsoft compilers newer than vc6.  */
+                         /* (If windows.h were used instead, there might be       */
+                         /*  issues re winsock.h included before winsock2.h )     */
 #include <windowsx.h>
 #include <Ntddndis.h>
 
@@ -99,6 +101,8 @@ struct sockaddr_storage {
 /* ... copied from RFC2553 */
 #endif /* WINVER */
 
+#include <Packet32.h>
+
 #define DETAILS_STR_MAX     1024