aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2008-10-24 22:13:09 +0000
committerBill Meier <wmeier@newsguy.com>2008-10-24 22:13:09 +0000
commit0e7d674d23129cdd2ad14376253f104b9b9ebed8 (patch)
tree6189fee092b1d2e724fc933f222a6cda9c967d8b /gtk
parentee48afbc74655f8db58fdf0bdd25ca7840a82b24 (diff)
Fix for SVN #26535 so that building Wireshark with VC6 doesn't fail.
svn path=/trunk/; revision=26545
Diffstat (limited to 'gtk')
-rw-r--r--gtk/capture_if_details_dlg_win32.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/capture_if_details_dlg_win32.c b/gtk/capture_if_details_dlg_win32.c
index d6c3f2318a..788101f105 100644
--- a/gtk/capture_if_details_dlg_win32.c
+++ b/gtk/capture_if_details_dlg_win32.c
@@ -49,8 +49,10 @@
#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