fix log msg typo

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

diff --git a/config.h.win32 b/config.h.win32
index 173466bc70c82dd9c31c8f5f997e835ef89a2b47..a49d6ec7927b23d03cca61cf271779c9e9f73822 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -20,6 +20,10 @@
 #define __STDC__ 0
 #endif
 
+/* Use Unicode in Windows runtime functions. */
+#define UNICODE 1
+#define _UNICODE 1
+
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
 
@@ -33,45 +37,46 @@
 #define HAVE_PLUGINS           1
 #define PLUGINS_NEED_ADDRESS_TABLE 1
 
-/* Plugins can also use the import library of libethereal.dll instead
+/* Plugins can also use the import library of libwireshark.dll instead
    of the old API. In that case we undefine PLUGINS_NEED_ADDRESS_TABLE 
    for the plugin. We don't undefine PLUGINS_NEED_ADDRESS_TABLE globally.
-   Thus Ethereal will be still able to load plugins using the old API. 
-   The macro HAVE_WIN32_LIBETHEREAL_LIB has to be defined in plugin's 
+   Thus Wireshark will be still able to load plugins using the old API. 
+   The macro HAVE_WIN32_LIBWIRESHARK_LIB has to be defined in plugin's 
    makefile.nmake. A template is available in doc/README.plugins */
-#ifdef HAVE_WIN32_LIBETHEREAL_LIB
+#ifdef HAVE_WIN32_LIBWIRESHARK_LIB
 #undef PLUGINS_NEED_ADDRESS_TABLE
 #endif
 
 /* #undef HAVE_SA_LEN */
 
-/* #undef NEED_SNPRINTF_H */
-
 /* #undef NEED_STRERROR_H */
 
 #define NEED_MKSTEMP 1
 
 @HAVE_LIBPCAP@
+@HAVE_PCAP_BREAKLOOP@
 @HAVE_PCAP_FINDALLDEVS@
 @HAVE_PCAP_DATALINK_NAME_TO_VAL@
 @HAVE_PCAP_DATALINK_VAL_TO_NAME@
 @WPCAP_CONSTIFIED@
-@HAVE_LIBETHEREALDLL@
+@HAVE_LIBWIRESHARKDLL@
+
+@HAVE_AIRPCAP@
+@HAVE_AIRPDCAP@
 
 /* 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_LIBETHEREAL and _NEED_VAR_IMPORT_
+ * it depends on HAVE_LIBWIRESHARK and _NEED_VAR_IMPORT_
  */
-#if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBETHEREALDLL)
-#  define ETH_VAR_IMPORT __declspec(dllimport) extern
+#if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBWIRESHARKDLL)
+#  define WS_VAR_IMPORT __declspec(dllimport) extern
 #else
-#  define ETH_VAR_IMPORT extern
+#  define WS_VAR_IMPORT extern
 #endif
 
-#define HAVE_NET_SNMP 1
-#define HAVE_SOME_SNMP 1
+@HAVE_NET_SNMP@
 
 /* Define if you have the gethostbyname2 function.  */
 /* #undef HAVE_GETHOSTBYNAME2 */
@@ -86,7 +91,7 @@
 #define HAVE_FCNTL_H 1
 
 /* Define if you have the <iconv.h> header file.  */
-/* #undef HAVE_ICONV_H */
+/* #undef HAVE_ICONV */
 
 /* Define if you have the <netdb.h> header file.  */
 /* #undef HAVE_NETDB_H */
@@ -127,9 +132,6 @@
 /* Define if you have the <sys/wait.h> header file.  */
 /* #undef HAVE_SYS_WAIT_H */
 
-/* Define if you have the <ucd-snmp/version.h> header file.  */
-/* #undef HAVE_UCD_SNMP_VERSION_H */
-
 /* Define if you have the <unistd.h> header file.  */
 /* #define HAVE_UNISTD_H 1 */
 
@@ -164,9 +166,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 */
@@ -174,7 +181,8 @@
 
 #ifndef PRIX64
 #ifdef _MSC_EXTENSIONS
-#define PRIX64  "I64X"
+/*#define PRIX64  "I64X"*/
+#define PRIX64  "llX"
 #else /* _MSC_EXTENSIONS */
 #define PRIX64  "llX"
 #endif /* _MSC_EXTENSIONS */
@@ -193,8 +201,26 @@
 /* Define to use the Nettle library */
 @HAVE_NETTLE@
 
-/* Define to use the gnutls library*/
-@HAVE_GNUTLS@
+/* Define to use the gnutls library */
+@HAVE_LIBGNUTLS@
+
+/* Define to use the libgcrypt library */
+@HAVE_LIBGCRYPT@
+
+/* Define to use mit kerberos for decryption of kerberos/sasl/dcerpc */
+@HAVE_KFW@
+#ifdef HAVE_MIT_KERBEROS
+#define HAVE_KERBEROS
+#endif
+
+/* Define to use Lua */
+@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
@@ -207,7 +233,6 @@
 #define NEED_INET_V6DEFS_H     1
 #define NEED_GETOPT_H          1
 #define NEED_STRPTIME_H                1
-#define snprintf               _snprintf
 #define strcasecmp             stricmp
 #define strncasecmp            strnicmp
 #define popen                  _popen
@@ -218,13 +243,10 @@
 #define _WINDOWS                1*/
 
 /* Name of package */
-#define PACKAGE "ethereal"
+#define PACKAGE "wireshark"
 
 /* Version number of package */
 #define VERSION "@VERSION@"
 
-/* We don't know what the plugin installation directory will be. */
-#define PLUGIN_DIR NULL
-
 /* We shouldn't need this under Windows but we'll define it anyway. */
 #define HTML_VIEWER "mozilla"