Fix for bug 881. Adding processing of error packet when server greeting is expected.

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

diff --git a/config.h.win32 b/config.h.win32
index 514d0648e3535febf784cec877cc665fe51fd173..a78f6254bcd2bba023eaf2efd2e348e5472325a8 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.47 2004/06/20 09:31:48 ulfl Exp $ */
+/* $Id$ */
 /* config.h.win32 Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -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,6 +37,16 @@
 #define HAVE_PLUGINS           1
 #define PLUGINS_NEED_ADDRESS_TABLE 1
 
+/* Plugins can also use the import library of libethereal.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 
+   makefile.nmake. A template is available in doc/README.plugins */
+#ifdef HAVE_WIN32_LIBETHEREAL_LIB
+#undef PLUGINS_NEED_ADDRESS_TABLE
+#endif
+
 /* #undef HAVE_SA_LEN */
 
 /* #undef NEED_SNPRINTF_H */
@@ -43,9 +57,14 @@
 
 @HAVE_LIBPCAP@
 @HAVE_PCAP_FINDALLDEVS@
+@HAVE_PCAP_DATALINK_NAME_TO_VAL@
+@HAVE_PCAP_DATALINK_VAL_TO_NAME@
 @WPCAP_CONSTIFIED@
 @HAVE_LIBETHEREALDLL@
 
+/* 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_
  */
@@ -148,14 +167,22 @@
 #endif /* _MSC_EXTENSIONS */
 #endif /* PRIu64 */
 
-/* Format for printing 64-bit unsigned hexadecimal numbers */
-#ifndef PRIx64  
+/* Formats for printing 64-bit unsigned hexadecimal numbers */
+#ifndef PRIx64
 #ifdef _MSC_EXTENSIONS
 #define PRIx64  "I64x"
 #else /* _MSC_EXTENSIONS */
 #define PRIx64  "llx"
 #endif /* _MSC_EXTENSIONS */
-#endif /* PRIx64 */   
+#endif /* PRIx64 */
+
+#ifndef PRIX64
+#ifdef _MSC_EXTENSIONS
+#define PRIX64  "I64X"
+#else /* _MSC_EXTENSIONS */
+#define PRIX64  "llX"
+#endif /* _MSC_EXTENSIONS */
+#endif /* PRIX64 */
 
 /* Define if you have the z library (-lz).  */
 @HAVE_LIBZ@
@@ -167,16 +194,15 @@
 /* Define to use the PCRE library */
 @HAVE_PCRE@
 
-@HAVE_LIBETHEREALDLL@
+/* Define to use the Nettle library */
+@HAVE_NETTLE@
 
-/* define macro for importing variables from an dll 
- * it depends on HAVE_LIBETHEREAL and _NEED_VAR_IMPORT_
- */
-#if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBETHEREALDLL)
-#  define ETH_VAR_IMPORT __declspec(dllimport) extern
-#else
-#  define ETH_VAR_IMPORT extern
-#endif
+/* Define to use the gnutls library */
+@HAVE_GNUTLS@
+
+/* Define to use Lua */
+@HAVE_LUA@
+@HAVE_LUA_5_1@
 
 #ifndef WIN32
 #define WIN32                  1
@@ -185,17 +211,13 @@
 #define HAVE_WINDOWS_H         1
 #define HAVE_WINSOCK2_H                1
 #define HAVE_DIRECT_H          1
-#define HAVE_IO_H              1
 #define NEED_INET_ATON_H       1
 #define NEED_INET_V6DEFS_H     1
 #define NEED_GETOPT_H          1
 #define NEED_STRPTIME_H                1
 #define snprintf               _snprintf
-#define vsnprintf              _vsnprintf
 #define strcasecmp             stricmp
 #define strncasecmp            strnicmp
-#define open                   _open
-#define close                  _close
 #define popen                  _popen
 #define pclose                 _pclose
 
@@ -211,3 +233,6 @@
 
 /* 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"