fix a comment

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

diff --git a/config.h.win32 b/config.h.win32
index d84d9ccc312c246106c3969dd237d4bad2187fd6..930b1b4e257dd55851f760d126fa0b5c3b48d80a 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.45 2004/05/09 10:03:36 guy Exp $ */
+/* $Id$ */
 /* config.h.win32 Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -33,6 +33,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,6 +53,8 @@
 
 @HAVE_LIBPCAP@
 @HAVE_PCAP_FINDALLDEVS@
+@HAVE_PCAP_DATALINK_NAME_TO_VAL@
+@HAVE_PCAP_DATALINK_VAL_TO_NAME@
 @WPCAP_CONSTIFIED@
 @HAVE_LIBETHEREALDLL@
 
@@ -118,6 +130,45 @@
 /* Define if you have the <unistd.h> header file.  */
 /* #define HAVE_UNISTD_H 1 */
 
+/* Define if <inttypes.h> defines PRI[doxu]64 macros */
+/* #define INTTYPES_H_DEFINES_FORMATS */
+
+/* Format for printing 64-bit signed decimal numbers */
+#ifndef PRId64
+#ifdef _MSC_EXTENSIONS
+#define PRId64  "I64d"
+#else /* _MSC_EXTENSIONS */
+#define PRId64  "lld"
+#endif /* _MSC_EXTENSIONS */
+#endif /* PRId64 */
+
+/* Format for printing 64-bit unsigned octal numbers */
+#ifndef PRIo64
+#ifdef _MSC_EXTENSIONS
+#define PRIo64  "I64o"
+#else /* _MSC_EXTENSIONS */
+#define PRIo64  "llo"
+#endif /* _MSC_EXTENSIONS */   
+#endif /* PRIo64 */   
+
+/* Format for printing 64-bit unsigned decimal numbers */
+#ifndef PRIu64
+#ifdef _MSC_EXTENSIONS
+#define PRIu64  "I64u"
+#else /* _MSC_EXTENSIONS */
+#define PRIu64  "llu"  
+#endif /* _MSC_EXTENSIONS */
+#endif /* PRIu64 */
+
+/* Format 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 */   
+
 /* Define if you have the z library (-lz).  */
 @HAVE_LIBZ@
 
@@ -128,16 +179,8 @@
 /* Define to use the PCRE library */
 @HAVE_PCRE@
 
-@HAVE_LIBETHEREALDLL@
-
-/* 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 Nettle library */
+@HAVE_NETTLE@
 
 #ifndef WIN32
 #define WIN32                  1