Make non-static a variable that doesn't need to be static.

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

diff --git a/config.h.win32 b/config.h.win32
index 41cd54c593d969657e7a72703e6115565aa950c2..8a32639559c99c445cca2f8d319d13a50a73f9b2 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,7 +1,7 @@
 /* $Id$ */
 /* 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".
@@ -29,9 +29,6 @@
 #define UNICODE 1
 #define _UNICODE 1
 
-/* Use threads */
-#define USE_THREADS 1
-
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
 
@@ -55,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@
@@ -79,15 +75,6 @@
 @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)
-#  define WS_VAR_IMPORT __declspec(dllimport) extern
-#else
-#  define WS_VAR_IMPORT extern
-#endif
-
 /*
  * Define WS_MSVC_NORETURN appropriately for declarations of routines that
  * never return (just like Charlie on the MTA).
@@ -123,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 */
 
@@ -206,7 +196,7 @@
 
 /* Define to use Lua */
 @HAVE_LUA@
-@HAVE_LUA_5_1@
+@HAVE_LUA@
 
 /* Define to use Python */
 @HAVE_PYTHON@
@@ -219,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@
 
@@ -236,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
@@ -255,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"
 
@@ -272,4 +279,6 @@
 #pragma warning ( disable : 6011 )
 #endif
 
+#if !defined(QT_VERSION) || !defined(_SSIZE_T_DEFINED)
 typedef int ssize_t;
+#endif