X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=config.h.win32;h=d66faeb8be1f005454c07853c84925062cd1a8bd;hp=1be2f1856ee70d555ddf0b5049a04152f14caf4b;hb=32d2e71d0c3119d3b77965da756dd75dfea24248;hpb=f9c45cd9837e8e268decf8330a60bf95b4e13bca diff --git a/config.h.win32 b/config.h.win32 index 1be2f1856e..d66faeb8be 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,5 +1,5 @@ /* $Id$ */ -/* config.h.win32 Generated manually. :-) */ +/* config.h.win32. Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -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,44 @@ #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_PCAP_DATALINK_VAL_TO_DESCRIPTION@ @HAVE_LIBWIRESHARKDLL@ -@HAVE_AIRPCAP@ -@HAVE_AIRPDCAP@ +@HAVE_PCAP_LIST_DATALINKS@ +@HAVE_PCAP_FREE_DATALINKS@ +@HAVE_PCAP_SET_DATALINK@ + +@HAVE_REMOTE@ +@HAVE_PCAP_REMOTE@ +@HAVE_PCAP_OPEN@ +@HAVE_PCAP_OPEN_DEAD@ +@HAVE_BPF_IMAGE@ +@HAVE_PCAP_SETSAMPLING@ /* 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_ +/* `pcap_get_selectable_fd' is UN*X-only. */ +/* #undef HAVE_PCAP_GET_SELECTABLE_FD */ + +@HAVE_AIRPCAP@ + +@PCAP_NG_DEFAULT@ +@WANT_PACKET_EDITOR@ + +/* define macro for importing variables from an dll + * 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,7 +85,16 @@ # define WS_VAR_IMPORT extern #endif -@HAVE_NET_SNMP@ +/* + * Define WS_MSVC_NORETURN appropriately for declarations of routines that + * never return (just like Charlie on the MTA). + * + * Note that MSVC++ expects __declspec(noreturn) to precede the function + * name and GCC, as far as I know, expects __attribute__((noreturn)) to + * follow the function name, so we need two different flavors of + * noreturn tag. + */ +#define WS_MSVC_NORETURN __declspec(noreturn) /* Define if you have the gethostbyname2 function. */ /* #undef HAVE_GETHOSTBYNAME2 */ @@ -87,6 +105,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 @@ -132,71 +153,38 @@ /* Define if you have the header file. */ /* #undef HAVE_SYS_WAIT_H */ +/* Define if tm_zone field exists in struct tm */ +/* #undef HAVE_TM_ZONE 1 */ + +/* Define if tzname array exists */ +/* #undef HAVE_TZNAME */ + /* 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@ +#ifdef HAVE_LIBZ +#define HAVE_INFLATEPRIME 1 +#endif + +/* 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 - -/* Define to use the PCRE library */ -@HAVE_PCRE@ +#endif /* Define to use the Nettle library */ @HAVE_NETTLE@ @@ -217,30 +205,49 @@ @HAVE_LUA@ @HAVE_LUA_5_1@ +/* Define to use Python */ +@HAVE_PYTHON@ + /* Define to use Portaudio library */ @HAVE_LIBPORTAUDIO@ /* Define version of of the Portaudio library API */ @PORTAUDIO_API_1@ +/* Define to have SMI */ +@HAVE_SMI@ + +/* Define to use GeoIP library */ +@HAVE_GEOIP@ + +/* Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later) */ +@HAVE_GEOIP_V6@ + +/* 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_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) & Visual C 10 (2010) need these prototypes */ +#if _MSC_VER == 1500 || _MSC_VER == 1600 +#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*/ +/* Define to use GTK */ +#define HAVE_GTK /* Name of package */ #define PACKAGE "wireshark" @@ -248,8 +255,23 @@ /* 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 + +/* Disable Code Analysis warnings that result in too many false positives. */ +/* http://msdn.microsoft.com/en-US/library/zyhb0b82.aspx */ +#if _MSC_VER >= 1400 +#pragma warning ( disable : 6011 ) +#endif + +#if !defined(QT_VERSION) || !defined(_SSIZE_T_DEFINED) +typedef int ssize_t; +#endif