From Peter Fuller:

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

diff --git a/config.h.win32 b/config.h.win32
index 50805365a0498be4e9051627faf507343addf491..deab5ee6e7c4fabbd3610367ff60b46d2a767906 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -20,6 +20,11 @@
 #define __STDC__ 0
 #endif
 
+/* 
+ * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h
+ */
+#define YY_NO_UNISTD_H
+
 /* Use Unicode in Windows runtime functions. */
 #define UNICODE 1
 #define _UNICODE 1
@@ -40,7 +45,7 @@
 /* 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. 
+   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_LIBWIRESHARK_LIB
@@ -49,8 +54,6 @@
 
 /* #undef HAVE_SA_LEN */
 
-/* #undef NEED_SNPRINTF_H */
-
 /* #undef NEED_STRERROR_H */
 
 #define NEED_MKSTEMP 1
@@ -63,11 +66,21 @@
 @WPCAP_CONSTIFIED@
 @HAVE_LIBWIRESHARKDLL@
 
+@HAVE_REMOTE@
+@HAVE_PCAP_REMOTE@
+@HAVE_PCAP_OPEN@
+@HAVE_PCAP_FINDALLDEVS_EX@
+@HAVE_PCAP_CREATESRCSTR@
+@HAVE_PCAP_SETSAMPLING@
+
+@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_LIBWIRESHARK and _NEED_VAR_IMPORT_
+ * it depends on HAVE_LIBWIRESHARKDLL and _NEED_VAR_IMPORT_
  */
 #if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBWIRESHARKDLL)
 #  define WS_VAR_IMPORT __declspec(dllimport) extern
@@ -75,9 +88,6 @@
 #  define WS_VAR_IMPORT extern
 #endif
 
-#define HAVE_NET_SNMP 1
-#define HAVE_SOME_SNMP 1
-
 /* Define if you have the gethostbyname2 function.  */
 /* #undef HAVE_GETHOSTBYNAME2 */
 
@@ -91,7 +101,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 */
@@ -132,9 +142,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 */
 
@@ -169,9 +176,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 */
@@ -179,7 +191,8 @@
 
 #ifndef PRIX64
 #ifdef _MSC_EXTENSIONS
-#define PRIX64  "I64X"
+/*#define PRIX64  "I64X"*/
+#define PRIX64  "llX"
 #else /* _MSC_EXTENSIONS */
 #define PRIX64  "llX"
 #endif /* _MSC_EXTENSIONS */
@@ -199,12 +212,30 @@
 @HAVE_NETTLE@
 
 /* Define to use the gnutls library */
-@HAVE_GNUTLS@
+@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@
+
+/* Define to have SMI */
+@HAVE_SMI@
+
+
 #ifndef WIN32
 #define WIN32                  1
 #endif
@@ -214,9 +245,13 @@
 #define HAVE_DIRECT_H          1
 #define NEED_INET_ATON_H       1
 #define NEED_INET_V6DEFS_H     1
+/* Visual C 9 (2008) now needs these prototypes */
+#if _MSC_VER == 1500
+#define NTDDI_VERSION NTDDI_WIN2K
+#define _WIN32_WINNT _WIN32_WINNT_WIN2K
+#endif
 #define NEED_GETOPT_H          1
 #define NEED_STRPTIME_H                1
-#define snprintf               _snprintf
 #define strcasecmp             stricmp
 #define strncasecmp            strnicmp
 #define popen                  _popen
@@ -232,8 +267,13 @@
 /* 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"
+
+/* Check for the required _MSC_VER */
+#if MSC_VER_REQUIRED != _MSC_VER
+#define WS_TO_STRING2(x) #x
+#define WS_TO_STRING(x) WS_TO_STRING2(x)
+#pragma message( "_MSC_VER is:" WS_TO_STRING(_MSC_VER) " but required is:" WS_TO_STRING(MSC_VER_REQUIRED) )
+#error Your MSVC_VARIANT setting in config.nmake doesn't match the MS compiler version!
+#endif