Make gtk/capture_if_details_dlg_win32.c compileable using MSVC6 with SDK

svn path=/trunk/; revision=28314

diff --git a/Makefile.nmake b/Makefile.nmake
index f4236055ec06fc43f155ada49a566508ddaa99a9..a4d113262e3573ed34361091f24ac2e3ca96e868 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -355,6 +355,7 @@ config.h    : config.h.win32 config.nmake
            -e "s/@HAVE_SMI@/$(SMI_CONFIG)/" \
            -e "s/@HAVE_GEOIP@/$(GEOIP_CONFIG)/" \
            -e "s/@INET6@/$(INET6_CONFIG)/" \
+           -e "s/@HAVE_NTDDNDIS_H@/$(NTDDNDIS_CONFIG)/" \
            < config.h.win32 > $@
 
 

diff --git a/config.h.win32 b/config.h.win32
index 02c7c2d2957a34881ace0505dbb8b0ebd54c4ad5..96373ad309d181b29445d864c046b2345f1ed2a6 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -254,6 +254,9 @@
 /* Define for IPv6 */
 @INET6@
 
+/* Define to have ntddndis.h */
+@HAVE_NTDDNDIS_H@
+
 #define HAVE_WINDOWS_H         1
 #define HAVE_WINSOCK2_H                1
 #define HAVE_DIRECT_H          1

diff --git a/config.nmake b/config.nmake
index ca9b01149cfa050393b32f5c3348d7763b709c67..58e59837bb45b4533a2ffdf55bf4798130503e6f 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1180,3 +1180,9 @@ INET6_CONFIG=
 !ELSE
 INET6_CONFIG=^#define INET6 1
 !ENDIF
+
+!IF "$(MSVC_VARIANT)" == "MSVC6" && !DEFINED(MSSDK)
+NTDDNDIS_CONFIG=
+!ELSE
+NTDDNDIS_CONFIG=^#define HAVE_NTDDNDIS_H 1
+!ENDIF

diff --git a/gtk/capture_if_details_dlg_win32.c b/gtk/capture_if_details_dlg_win32.c
index caf2dcafc5342e8f96f68d8201f0ee8125088efe..48f55e039b53f540861edcde96ce77b48ffe68af 100644 (file)
--- a/gtk/capture_if_details_dlg_win32.c
+++ b/gtk/capture_if_details_dlg_win32.c
@@ -55,8 +55,13 @@
                          /*  issues re winsock.h included before winsock2.h )     */
 #include <windowsx.h>
 
-#if (_MSC_VER > 1200)
+#ifdef HAVE_NTDDNDIS_H
 #include <Ntddndis.h>
+/* VC 6.0 with SDK has the same Ntddndis.h as MSVC2003 */
+# if (_MSC_VER <= 1200)
+# undef _MSC_VER
+# define _MSC_VER 1310
+# endif
 #endif
 
 #include "../capture_wpcap_packet.h"