Makefile.nmake

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

diff --git a/config.h.win32 b/config.h.win32
index 72a2b2b48e5fb2d2a01f97fd2a50e0f63729762b..be279f80cacd78dc8f3c1b7c40131e4f1e56609a 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -61,6 +61,8 @@
 @WPCAP_CONSTIFIED@
 @HAVE_LIBWIRESHARKDLL@
 
+@HAVE_AIRPCAP@
+
 /* availability of pcap_freecode() is handled at runtime */
 #define HAVE_PCAP_FREECODE 1
 
@@ -73,8 +75,8 @@
 #  define WS_VAR_IMPORT extern
 #endif
 
-#define HAVE_NET_SNMP 1
-#define HAVE_SOME_SNMP 1
+@HAVE_NET_SNMP@
+@HAVE_SOME_SNMP@
 
 /* Define if you have the gethostbyname2 function.  */
 /* #undef HAVE_GETHOSTBYNAME2 */
@@ -167,9 +169,14 @@
 #endif /* PRIu64 */
 
 /* Formats for printing 64-bit unsigned hexadecimal numbers */
+/* XXX - it seems that GLib has problems with the MSVC like I64x.
+   As we use GLib's g_sprintf and alike, it should be safe to use
+   llx everywhere now, making the macros pretty useless. For details see:
+   http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1025 */
 #ifndef PRIx64
 #ifdef _MSC_EXTENSIONS
-#define PRIx64  "I64x"
+/*#define PRIx64  "I64x"*/
+#define PRIx64  "llx"
 #else /* _MSC_EXTENSIONS */
 #define PRIx64  "llx"
 #endif /* _MSC_EXTENSIONS */
@@ -177,7 +184,8 @@
 
 #ifndef PRIX64
 #ifdef _MSC_EXTENSIONS
-#define PRIX64  "I64X"
+/*#define PRIX64  "I64X"*/
+#define PRIX64  "llX"
 #else /* _MSC_EXTENSIONS */
 #define PRIX64  "llX"
 #endif /* _MSC_EXTENSIONS */
@@ -197,7 +205,10 @@
 @HAVE_NETTLE@
 
 /* Define to use the gnutls library */
-@HAVE_GNUTLS@
+@HAVE_LIBGNUTLS@
+
+/* Define to use the libgcrypt library */
+@HAVE_LIBGCRYPT@
 
 /* Define to use mit kerberos for decryption of kerberos/sasl/dcerpc */
 @HAVE_KFW@
@@ -209,6 +220,11 @@
 @HAVE_LUA@
 @HAVE_LUA_5_1@
 
+/* Define to use Portaudio library */
+@HAVE_LIBPORTAUDIO@
+/* Define  version of of the Portaudio library API */
+@PORTAUDIO_API_1@
+
 #ifndef WIN32
 #define WIN32                  1
 #endif