From Xiao Xiangquan:

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

diff --git a/config.h.win32 b/config.h.win32
index 27bce4b539b0296704cc24a6365c137d15a8fd5f..d66faeb8be1f005454c07853c84925062cd1a8bd 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* config.h.win32 Generated manually. :-) */
+/* config.h.win32.  Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
@@ -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
@@ -43,8 +43,6 @@
 
 /* #undef HAVE_SA_LEN */
 
-/* #undef NEED_STRERROR_H */
-
 /* #undef HAVE_MKSTEMP */
 /* #undef HAVE_MKDTEMP */
 
@@ -67,16 +65,18 @@
 @HAVE_BPF_IMAGE@
 @HAVE_PCAP_SETSAMPLING@
 
-@HAVE_AIRPCAP@
-@HAVE_AIRPDCAP@
-
-/* Use new packet list or not */
-@HAVE_NEW_PACKET_LIST@
-
 /* availability of pcap_freecode() is handled at runtime */
 #define HAVE_PCAP_FREECODE 1
 
-/* define macro for importing variables from an dll 
+/* `pcap_get_selectable_fd' is UN*X-only. */
+/* #undef HAVE_PCAP_GET_SELECTABLE_FD */
+
+@HAVE_AIRPCAP@
+
+@PCAP_NG_DEFAULT@
+@WANT_PACKET_EDITOR@
+
+/* 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)
@@ -85,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 */
 
@@ -162,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@
@@ -172,9 +186,6 @@
 #define ADNS_JGAA_WIN32 1
 #endif
 
-/* Define to use the PCRE library */
-@HAVE_PCRE@
-
 /* Define to use the Nettle library */
 @HAVE_NETTLE@
 
@@ -205,9 +216,12 @@
 /* Define to have SMI */
 @HAVE_SMI@
 
-/* Define to have GeoIP */
+/* Define to use GeoIP library */
 @HAVE_GEOIP@
 
+/* Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later) */
+@HAVE_GEOIP_V6@
+
 /* Define for IPv6 */
 @INET6@
 
@@ -232,7 +246,7 @@
 #define popen                  _popen
 #define pclose                 _pclose
 
-/* Define to use GTK *(/
+/* Define to use GTK */
 #define HAVE_GTK
 
 /* Name of package */
@@ -252,4 +266,12 @@
 #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
+
+#if !defined(QT_VERSION) || !defined(_SSIZE_T_DEFINED)
 typedef int ssize_t;
+#endif