Fix a couple (value) mistakes in value_strings. Found by Martin's patch on the ...

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

diff --git a/config.h.win32 b/config.h.win32
index 73607cb6fd304cde702dee7fd2c621a72e57a3cd..950c34e1df92695c9e6aa812a5431403fb6e947a 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -57,18 +57,21 @@
 @HAVE_LIBWIRESHARKDLL@
 
 @HAVE_PCAP_LIST_DATALINKS@
+@HAVE_PCAP_FREE_DATALINKS@
 @HAVE_PCAP_SET_DATALINK@
 
 @HAVE_REMOTE@
 @HAVE_PCAP_REMOTE@
 @HAVE_PCAP_OPEN@
+@HAVE_PCAP_OPEN_DEAD@
+@HAVE_BPF_IMAGE@
 @HAVE_PCAP_SETSAMPLING@
 
 @HAVE_AIRPCAP@
 @HAVE_AIRPDCAP@
 
-/* Use new packet list or not Warning Experimental */
-@HAVE_NEW_PACKET_LIST@
+@MAIN_MENU_USE_UIMANAGER@
+@WANT_PACKET_EDITOR@
 
 /* availability of pcap_freecode() is handled at runtime */
 #define HAVE_PCAP_FREECODE 1
@@ -82,6 +85,17 @@
 #  define WS_VAR_IMPORT extern
 #endif
 
+/*
+ * Define WS_MSVC_NORETURN appropriately for declarations of routines that
+ * never return (just like Charlie on the MTA).
+ *
+ * Note that MSVC++ expects __declspec(noreturn) to precede the function
+ * name and GCC, as far as I know, expects __attribute__((noreturn)) to
+ * follow the function name, so we need two different flavors of
+ * noreturn tag.
+ */
+#define WS_MSVC_NORETURN       __declspec(noreturn)
+
 /* Define if you have the gethostbyname2 function.  */
 /* #undef HAVE_GETHOSTBYNAME2 */
 
@@ -159,6 +173,9 @@
 
 /* Define if you have the z library (-lz).  */
 @HAVE_LIBZ@
+#ifdef HAVE_LIBZ
+#define HAVE_INFLATEPRIME 1
+#endif
 
 /* Define to use GNU ADNS library */
 @HAVE_C_ARES@
@@ -191,6 +208,9 @@
 @HAVE_LUA@
 @HAVE_LUA_5_1@
 
+/* Define to use Python */
+@HAVE_PYTHON@
+
 /* Define to use Portaudio library */
 @HAVE_LIBPORTAUDIO@
 /* Define  version of of the Portaudio library API */
@@ -216,8 +236,8 @@
 #define WIN32                  1
 #endif
 
-/* Visual C 9 (2008) now needs these prototypes */
-#if _MSC_VER == 1500
+/* Visual C 9 (2008) & Visual C 10 (2010) need these prototypes */
+#if _MSC_VER == 1500 || _MSC_VER == 1600
 #define NTDDI_VERSION NTDDI_WIN2K
 #define _WIN32_WINNT _WIN32_WINNT_WIN2K
 #endif
@@ -226,6 +246,9 @@
 #define popen                  _popen
 #define pclose                 _pclose
 
+/* Define to use GTK */
+#define HAVE_GTK
+
 /* Name of package */
 #define PACKAGE "wireshark"
 
@@ -242,3 +265,11 @@
 #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
+
+/* Disable Code Analysis warnings that result in too many false positives. */
+/* http://msdn.microsoft.com/en-US/library/zyhb0b82.aspx */
+#if _MSC_VER >= 1400
+#pragma warning ( disable : 6011 )
+#endif
+
+typedef int ssize_t;