Fix a few minor memory leaks...

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

diff --git a/config.h.win32 b/config.h.win32
index 1e4e1e583f4ab9e2593949bf5c78ef9ccba473ee..02c7c2d2957a34881ace0505dbb8b0ebd54c4ad5 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,9 @@
 @WPCAP_CONSTIFIED@
 @HAVE_LIBWIRESHARKDLL@
 
+@HAVE_PCAP_LIST_DATALINKS@
+@HAVE_PCAP_SET_DATALINK@
+
 @HAVE_REMOTE@
 @HAVE_PCAP_REMOTE@
 @HAVE_PCAP_OPEN@
@@ -197,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@
@@ -230,11 +243,17 @@
 /* Define to have SMI */
 @HAVE_SMI@
 
+/* Define to have GeoIP */
+@HAVE_GEOIP@
+
 
 #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
@@ -264,3 +283,11 @@
 
 /* We shouldn't need this under Windows but we'll define it anyway. */
 #define HTML_VIEWER "mozilla"
+
+/* 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