Fix for bug 2944:

[obnox/wireshark/wip.git] / config.h.win32

diff --git a/config.h.win32 b/config.h.win32
index 1bc5ab3e8e3e841002e8e12b82107df8f8c40a9d..5af37fbbdff28901b8c4cd350c8aaa29f25546a3 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -20,6 +20,11 @@
 #define __STDC__ 0
 #endif
 
+/* 
+ * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h
+ */
+#define YY_NO_UNISTD_H
+
 /* Use Unicode in Windows runtime functions. */
 #define UNICODE 1
 #define _UNICODE 1
@@ -61,6 +66,16 @@
 @WPCAP_CONSTIFIED@
 @HAVE_LIBWIRESHARKDLL@
 
+@HAVE_PCAP_LIST_DATALINKS@
+@HAVE_PCAP_SET_DATALINK@
+
+@HAVE_REMOTE@
+@HAVE_PCAP_REMOTE@
+@HAVE_PCAP_OPEN@
+@HAVE_PCAP_FINDALLDEVS_EX@
+@HAVE_PCAP_CREATESRCSTR@
+@HAVE_PCAP_SETSAMPLING@
+
 @HAVE_AIRPCAP@
 @HAVE_AIRPDCAP@
 
@@ -68,7 +83,7 @@
 #define HAVE_PCAP_FREECODE 1
 
 /* define macro for importing variables from an dll 
- * it depends on HAVE_LIBWIRESHARK and _NEED_VAR_IMPORT_
+ * it depends on HAVE_LIBWIRESHARKDLL and _NEED_VAR_IMPORT_
  */
 #if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBWIRESHARKDLL)
 #  define WS_VAR_IMPORT __declspec(dllimport) extern
@@ -76,8 +91,6 @@
 #  define WS_VAR_IMPORT extern
 #endif
 
-@HAVE_NET_SNMP@
-
 /* Define if you have the gethostbyname2 function.  */
 /* #undef HAVE_GETHOSTBYNAME2 */
 
@@ -192,8 +205,13 @@
 @HAVE_LIBZ@
 
 /* Define to use GNU ADNS library */
+@HAVE_C_ARES@
+
+/* Define to use GNU ADNS library */
+#ifndef HAVE_C_ARES
 @HAVE_GNU_ADNS@
 #define ADNS_JGAA_WIN32 1
+#endif
 
 /* Define to use the PCRE library */
 @HAVE_PCRE@
@@ -222,15 +240,27 @@
 /* Define  version of of the Portaudio library API */
 @PORTAUDIO_API_1@
 
+/* Define to have SMI */
+@HAVE_SMI@
+
+
 #ifndef WIN32
 #define WIN32                  1
 #endif
 
+/* Define for IPv6 */
+@INET6@
+
 #define HAVE_WINDOWS_H         1
 #define HAVE_WINSOCK2_H                1
 #define HAVE_DIRECT_H          1
 #define NEED_INET_ATON_H       1
 #define NEED_INET_V6DEFS_H     1
+/* Visual C 9 (2008) now needs these prototypes */
+#if _MSC_VER == 1500
+#define NTDDI_VERSION NTDDI_WIN2K
+#define _WIN32_WINNT _WIN32_WINNT_WIN2K
+#endif
 #define NEED_GETOPT_H          1
 #define NEED_STRPTIME_H                1
 #define strcasecmp             stricmp
@@ -248,20 +278,13 @@
 /* Version number of package */
 #define VERSION "@VERSION@"
 
-/* We don't know what the plugin installation directory will be. */
-#define PLUGIN_DIR NULL
-
 /* We shouldn't need this under Windows but we'll define it anyway. */
 #define HTML_VIEWER "mozilla"
 
-/* check if the MSVC_VARIANT setting in config.nmake and the current MSVC compiler version matches together */
-/* user might forget to set this or the PATH to the C compiler could be wrong */
-#if _MSC_VER == 1400 && (MSVC_VARIANT != MSVC2005EE || MSVC_VARIANT != MSVC2005 || MSVC_VARIANT != DOTNET20 || MSVC_VARIANT != DOTNET30)
-#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 14.00 (V8.0) don't match!
-#elseif _MSC_VER == 1310 && (MSVC_VARIANT != MSVC2003 || MSVC_VARIANT != DOTNET11)
-#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 13.10 (V7.1) don't match!
-#elseif _MSC_VER == 1300 && (MSVC_VARIANT != MSVC2002 || MSVC_VARIANT != DOTNET10)
-#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 13.00 (V7.0) don't match!
-#elseif _MSC_VER == 1200 && (MSVC_VARIANT != MSVC6)
-#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 12.00 (V6.0) don't match!
+/* Check for the required _MSC_VER */
+#if MSC_VER_REQUIRED != _MSC_VER
+#define WS_TO_STRING2(x) #x
+#define WS_TO_STRING(x) WS_TO_STRING2(x)
+#pragma message( "_MSC_VER is:" WS_TO_STRING(_MSC_VER) " but required is:" WS_TO_STRING(MSC_VER_REQUIRED) )
+#error Your MSVC_VARIANT setting in config.nmake doesn't match the MS compiler version!
 #endif