X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=config.h.win32;h=6cc50556c176d3f742c312b137ac5ad548b3da8b;hb=c9039f7602c040db2f4df02bfdc188d06a96db43;hp=516a2c79b796875d1e409aff4f4b152a8881179e;hpb=9012e2d5ebc48e1e77d1e64c2793c6d7dad5f614;p=obnox%2Fwireshark%2Fwip.git diff --git a/config.h.win32 b/config.h.win32 index 516a2c79b7..6cc50556c1 100644 --- 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 @@ -35,40 +40,40 @@ #define YYTEXT_POINTER 1 #define HAVE_PLUGINS 1 -#define PLUGINS_NEED_ADDRESS_TABLE 1 - -/* 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 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 -#undef PLUGINS_NEED_ADDRESS_TABLE -#endif /* #undef HAVE_SA_LEN */ /* #undef NEED_STRERROR_H */ -#define NEED_MKSTEMP 1 +/* #undef HAVE_MKSTEMP */ +/* #undef HAVE_MKDTEMP */ @HAVE_LIBPCAP@ @HAVE_PCAP_BREAKLOOP@ @HAVE_PCAP_FINDALLDEVS@ @HAVE_PCAP_DATALINK_NAME_TO_VAL@ @HAVE_PCAP_DATALINK_VAL_TO_NAME@ -@WPCAP_CONSTIFIED@ @HAVE_LIBWIRESHARKDLL@ +@HAVE_PCAP_LIST_DATALINKS@ +@HAVE_PCAP_SET_DATALINK@ + +@HAVE_REMOTE@ +@HAVE_PCAP_REMOTE@ +@HAVE_PCAP_OPEN@ +@HAVE_PCAP_SETSAMPLING@ + @HAVE_AIRPCAP@ @HAVE_AIRPDCAP@ +/* Use new packet list or not Warning Experimental */ +@HAVE_NEW_PACKET_LIST@ + /* 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 @@ -76,8 +81,6 @@ # define WS_VAR_IMPORT extern #endif -@HAVE_NET_SNMP@ - /* Define if you have the gethostbyname2 function. */ /* #undef HAVE_GETHOSTBYNAME2 */ @@ -87,6 +90,9 @@ /* Define if you have the header file. */ /* #undef HAVE_ARPA_INET_H */ +/* Define if you have the header file. */ +#define HAVE_DIRECT_H 1 + /* Define if you have the header file. */ #define HAVE_FCNTL_H 1 @@ -135,65 +141,26 @@ /* Define if you have the header file. */ /* #define HAVE_UNISTD_H 1 */ +/* Define if you have the header file. */ +#define HAVE_WINDOWS_H 1 + +/* Define if you have the header file. */ +#define HAVE_WINSOCK2_H 1 + /* Define if 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 */ - -/* 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 "llx" -#else /* _MSC_EXTENSIONS */ -#define PRIx64 "llx" -#endif /* _MSC_EXTENSIONS */ -#endif /* PRIx64 */ - -#ifndef PRIX64 -#ifdef _MSC_EXTENSIONS -/*#define PRIX64 "I64X"*/ -#define PRIX64 "llX" -#else /* _MSC_EXTENSIONS */ -#define PRIX64 "llX" -#endif /* _MSC_EXTENSIONS */ -#endif /* PRIX64 */ - /* Define if you have the z library (-lz). */ @HAVE_LIBZ@ /* Define to use GNU ADNS library */ +@HAVE_C_ARES@ + +/* Define to use GNU ADNS library */ +#ifndef HAVE_C_ARES @HAVE_GNU_ADNS@ #define ADNS_JGAA_WIN32 1 +#endif /* Define to use the PCRE library */ @HAVE_PCRE@ @@ -222,46 +189,50 @@ /* Define version of of the Portaudio library API */ @PORTAUDIO_API_1@ +/* Define to have SMI */ +@HAVE_SMI@ + +/* Define to have GeoIP */ +@HAVE_GEOIP@ + +/* Define for IPv6 */ +@INET6@ + +/* Define to have ntddndis.h */ +@HAVE_NTDDNDIS_H@ + +#define NEED_INET_ATON_H 1 +#define NEED_INET_V6DEFS_H 1 +#define NEED_GETOPT_H 1 +#define NEED_STRPTIME_H 1 + #ifndef WIN32 #define WIN32 1 #endif -#define HAVE_WINDOWS_H 1 -#define HAVE_WINSOCK2_H 1 -#define HAVE_DIRECT_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 strcasecmp stricmp +/* 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 strncasecmp strnicmp #define popen _popen #define pclose _pclose -/* Needed for zlib, according to http://www.winimage.com/zLibDll/ */ -/*#define ZLIB_DLL 1 -#define _WINDOWS 1*/ - /* Name of package */ #define PACKAGE "wireshark" /* 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 if the MSVC_VARIANT setting in config.nmake and the current MSVC compiler version matches together */ -/* user might forget to set this or the PATH to the C compiler could be wrong */ -#if _MSC_VER != 1400 && (MSVC_VARIANT == MSVC2005EE || MSVC_VARIANT == MSVC2005 || MSVC_VARIANT == DOTNET20 || MSVC_VARIANT == DOTNET30) -#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 14.00 (V8.0) don't match! -#elseif _MSC_VER != 1310 && (MSVC_VARIANT == MSVC2003 || MSVC_VARIANT == DOTNET11) -#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 13.10 (V7.1) don't match! -#elseif _MSC_VER != 1300 && (MSVC_VARIANT == MSVC2002 || MSVC_VARIANT == DOTNET10) -#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 13.00 (V7.0) don't match! -#elseif _MSC_VER != 1200 && (MSVC_VARIANT == MSVC6) -#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 12.00 (V6.0) don't match! +/* 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