From Andrey Kulikov:

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

diff --git a/config.h.win32 b/config.h.win32
index 1f7ff3d00b84a2ffacc37bf50e4b9119a3057c56..7e5dae393ea7accf13a3d0da755e9d74add5e095 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -20,7 +20,7 @@
 #define __STDC__ 0
 #endif
 
-/* 
+/*
  * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h
  */
 #define YY_NO_UNISTD_H
@@ -40,17 +40,6 @@
 #define YYTEXT_POINTER 1
 
 #define HAVE_PLUGINS           1
-#define PLUGINS_NEED_ADDRESS_TABLE 1
-
-/* Plugins can also use the import library of libwireshark.dll instead
-   of the old API. In that case we undefine PLUGINS_NEED_ADDRESS_TABLE 
-   for the plugin. We don't undefine PLUGINS_NEED_ADDRESS_TABLE globally.
-   Thus Wireshark will be still able to load plugins using the old API. 
-   The macro HAVE_WIN32_LIBWIRESHARK_LIB has to be defined in plugin's 
-   makefile.nmake. A template is available in doc/README.plugins */
-#ifdef HAVE_WIN32_LIBWIRESHARK_LIB
-#undef PLUGINS_NEED_ADDRESS_TABLE
-#endif
 
 /* #undef HAVE_SA_LEN */
 
@@ -64,26 +53,30 @@
 @HAVE_PCAP_FINDALLDEVS@
 @HAVE_PCAP_DATALINK_NAME_TO_VAL@
 @HAVE_PCAP_DATALINK_VAL_TO_NAME@
+@HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION@
 @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@
+@PCAP_NG_DEFAULT@
+@MAIN_MENU_USE_UIMANAGER@
+@WANT_PACKET_EDITOR@
 
 /* availability of pcap_freecode() is handled at runtime */
 #define HAVE_PCAP_FREECODE 1
 
-/* define macro for importing variables from an dll 
+/* define macro for importing variables from an dll
  * it depends on HAVE_LIBWIRESHARKDLL and _NEED_VAR_IMPORT_
  */
 #if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBWIRESHARKDLL)
@@ -92,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 */
 
@@ -149,6 +153,12 @@
 /* Define if you have the <sys/wait.h> header file.  */
 /* #undef HAVE_SYS_WAIT_H */
 
+/* Define if tm_zone field exists in struct tm */
+/* #undef HAVE_TM_ZONE 1 */
+
+/* Define if tzname array exists */
+/* #undef HAVE_TZNAME */
+
 /* Define if you have the <unistd.h> header file.  */
 /* #define HAVE_UNISTD_H 1 */
 
@@ -163,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@
@@ -195,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 */
@@ -206,30 +222,36 @@
 /* Define to have GeoIP */
 @HAVE_GEOIP@
 
-#ifndef WIN32
-#define WIN32                  1
-#endif
-
 /* Define for IPv6 */
 @INET6@
 
 /* Define to have ntddndis.h */
 @HAVE_NTDDNDIS_H@
 
-#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 NEED_INET_ATON_H    1
+#define NEED_INET_V6DEFS_H  1
+#define NEED_STRPTIME_H     1
+
+#ifndef WIN32
+#define WIN32                  1
+#endif
+
+/* 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
+#else
+/* IsDebuggerPresent() and AttachConsole() needs this #define! */
+#define _WIN32_WINNT 0x0500
 #endif
-#define NEED_GETOPT_H          1
-#define NEED_STRPTIME_H                1
-#define strcasecmp             stricmp
+
 #define strncasecmp            strnicmp
 #define popen                  _popen
 #define pclose                 _pclose
 
+/* Define to use GTK */
+#define HAVE_GTK
+
 /* Name of package */
 #define PACKAGE "wireshark"
 
@@ -246,3 +268,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;