Re-generate a number of ASN.1-based dissectors with the most recent

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

diff --git a/config.h.win32 b/config.h.win32
index 5ae0f8a53cfc56c130217451d4b2cdfcc1ebe366..02e5719e59b4774210ec32b67a5bbfa1f9cce30f 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.28 2001/05/01 02:44:51 guy Exp $ */
+/* $Id$ */
 /* config.h.win32 Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -28,14 +28,22 @@
 /* #undef WORDS_BIGENDIAN */
 
 /* Define if lex declares yytext as a char * by default, not a char[].  */
-/* #undef YYTEXT_POINTER */
+#define YYTEXT_POINTER 1
 
 #define HAVE_PLUGINS           1
 #define PLUGINS_NEED_ADDRESS_TABLE 1
 
-/* #undef HAVE_SA_LEN */
+/* 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
 
-#define DATAFILE_DIR "/usr/local/etc"
+/* #undef HAVE_SA_LEN */
 
 /* #undef NEED_SNPRINTF_H */
 
@@ -43,8 +51,24 @@
 
 #define NEED_MKSTEMP 1
 
-#define HAVE_LIBPCAP 1
-#define WPCAP_STRING "0.5.2 (WinPcap 2.1)"
+@HAVE_LIBPCAP@
+@HAVE_PCAP_FINDALLDEVS@
+@HAVE_PCAP_DATALINK_NAME_TO_VAL@
+@HAVE_PCAP_DATALINK_VAL_TO_NAME@
+@WPCAP_CONSTIFIED@
+@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 HAVE_NET_SNMP 1
+#define HAVE_SOME_SNMP 1
 
 /* Define if you have the gethostbyname2 function.  */
 /* #undef HAVE_GETHOSTBYNAME2 */
@@ -58,6 +82,9 @@
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
 
+/* Define if you have the <iconv.h> header file.  */
+/* #undef HAVE_ICONV_H */
+
 /* Define if you have the <netdb.h> header file.  */
 /* #undef HAVE_NETDB_H */
 
@@ -97,29 +124,73 @@
 /* Define if you have the <sys/wait.h> header file.  */
 /* #undef HAVE_SYS_WAIT_H */
 
-/* Define if you have the <ucd-snmp/snmp.h> header file.  */
-/* #undef HAVE_UCD_SNMP_SNMP_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 */
 
+/* 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).  */
-/*#define HAVE_LIBZ 1*/
+@HAVE_LIBZ@
+
+/* Define to use GNU ADNS library */
+@HAVE_GNU_ADNS@
+#define ADNS_JGAA_WIN32 1
+
+/* Define to use the PCRE library */
+@HAVE_PCRE@
 
 #ifndef WIN32
 #define WIN32                  1
 #endif
 
 #define HAVE_WINDOWS_H         1
-#define HAVE_WINSOCK_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
@@ -139,6 +210,5 @@
 /* Version number of package */
 #define VERSION "@VERSION@"
 
-/* Plugin installation directory... */
-#define PLUGIN_DIR "C:/ethereal/plugins/@VERSION@"
-
+/* We don't know what the plugin installation directory will be. */
+#define PLUGIN_DIR NULL