From Colin O'Flynn:

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

diff --git a/config.h.win32 b/config.h.win32
index d95ac8c7b11b5f0e1c0b8a47750f962d28f4f732..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.  */
 
@@ -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
 
@@ -68,15 +65,17 @@
 @HAVE_BPF_IMAGE@
 @HAVE_PCAP_SETSAMPLING@
 
+/* availability of pcap_freecode() is handled at runtime */
+#define HAVE_PCAP_FREECODE 1
+
+/* `pcap_get_selectable_fd' is UN*X-only. */
+/* #undef HAVE_PCAP_GET_SELECTABLE_FD */
+
 @HAVE_AIRPCAP@
 
 @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
  * it depends on HAVE_LIBWIRESHARKDLL and _NEED_VAR_IMPORT_
  */
@@ -217,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@
 
@@ -270,4 +272,6 @@
 #pragma warning ( disable : 6011 )
 #endif
 
+#if !defined(QT_VERSION) || !defined(_SSIZE_T_DEFINED)
 typedef int ssize_t;
+#endif