Make gtk/capture_if_details_dlg_win32.c compileable using MSVC6 with SDK

svn path=/trunk/; revision=28314

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 > $@
 
 

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

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

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"