print.c and ps.c are in libwirshark now.

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

diff --git a/config.h.win32 b/config.h.win32
index 92f7057a162d17678b93a0793636dd50cd12fa01..8a32639559c99c445cca2f8d319d13a50a73f9b2 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,7 +1,7 @@
 /* $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.  */
+/* config.h.in.  Generated automatically from configure.ac by autoheader.  */
 
 /* Generated Bison and Flex files test whether __STDC__ is defined
    in order to check whether to use ANSI C features such as "const".
@@ -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 */
 
@@ -54,7 +52,6 @@
 @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@
@@ -67,23 +64,27 @@
 @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 
- * it depends on HAVE_LIBWIRESHARKDLL and _NEED_VAR_IMPORT_
+/* `pcap_get_selectable_fd' is UN*X-only. */
+/* #undef HAVE_PCAP_GET_SELECTABLE_FD */
+
+@HAVE_AIRPCAP@
+
+@PCAP_NG_DEFAULT@
+@WANT_PACKET_EDITOR@
+
+/*
+ * 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.
  */
-#if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBWIRESHARKDLL)
-#  define WS_VAR_IMPORT __declspec(dllimport) extern
-#else
-#  define WS_VAR_IMPORT extern
-#endif
+#define WS_MSVC_NORETURN       __declspec(noreturn)
 
 /* Define if you have the gethostbyname2 function.  */
 /* #undef HAVE_GETHOSTBYNAME2 */
@@ -109,6 +110,9 @@
 /* Define if you have the <netinet/in.h> header file.  */
 /* #define HAVE_NETINET_IN_H 1 */
 
+/* Define if your printf() function supports thousands grouping. */
+/* #undef HAVE_GLIB_PRINTF_GROUPING */
+
 /* Define if you have the <snmp/snmp.h> header file.  */
 /* #undef HAVE_SNMP_SNMP_H */
 
@@ -162,6 +166,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 +179,6 @@
 #define ADNS_JGAA_WIN32 1
 #endif
 
-/* Define to use the PCRE library */
-@HAVE_PCRE@
-
 /* Define to use the Nettle library */
 @HAVE_NETTLE@
 
@@ -192,7 +196,7 @@
 
 /* Define to use Lua */
 @HAVE_LUA@
-@HAVE_LUA_5_1@
+@HAVE_LUA@
 
 /* Define to use Python */
 @HAVE_PYTHON@
@@ -205,9 +209,15 @@
 /* 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 to enable WinSparkle software updates */
+@HAVE_SOFTWARE_UPDATE@
+
 /* Define for IPv6 */
 @INET6@
 
@@ -222,8 +232,14 @@
 #define WIN32                  1
 #endif
 
-/* Visual C 9 (2008) & Visual C 10 (2010) need these prototypes */
-#if _MSC_VER == 1500 || _MSC_VER == 1600
+/* Wireshark's marker that a function parameter is unused.  Used to avoid
+ * warnings on compilers that support such hints.
+ */
+#define _U_
+
+/* Visual C 9 (2008), Visual C 10 (2010) and Visual C 11 (2012) need these prototypes */
+/* XXX: Can we use MSC_VER >= 1500 ?? */
+#if _MSC_VER == 1500 || _MSC_VER == 1600 || _MSC_VER == 1700
 #define NTDDI_VERSION NTDDI_WIN2K
 #define _WIN32_WINNT _WIN32_WINNT_WIN2K
 #endif
@@ -241,6 +257,11 @@
 /* Version number of package */
 #define VERSION "@VERSION@"
 
+/* Broken down version */
+#define VERSION_MAJOR @VERSION_MAJOR@
+#define VERSION_MINOR @VERSION_MINOR@
+#define VERSION_MICRO @VERSION_MICRO@
+
 /* We shouldn't need this under Windows but we'll define it anyway. */
 #define HTML_VIEWER "mozilla"
 
@@ -252,4 +273,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