More warining fixes: char -> const char

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

diff --git a/config.h.win32 b/config.h.win32
index 05c0f6b2edeb05466305ff255cb21aa1e5ee9a6a..e45839a22ec4f8a43fff1097d536a42729f02c05 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -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,9 +53,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_
  */
@@ -157,9 +172,6 @@
 #endif /* _MSC_EXTENSIONS */
 #endif /* PRIx64 */   
 
-/* Map "_strtoui64()" to "strtoll()" */
-#define        strtoll _strtoui64
-
 /* Define if you have the z library (-lz).  */
 @HAVE_LIBZ@
 
@@ -170,16 +182,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