X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=config.h.win32;h=6cc50556c176d3f742c312b137ac5ad548b3da8b;hb=c9039f7602c040db2f4df02bfdc188d06a96db43;hp=02c7c2d2957a34881ace0505dbb8b0ebd54c4ad5;hpb=d0328301de3547eba77f2d357510b78224535863;p=obnox%2Fwireshark%2Fwip.git

diff --git a/config.h.win32 b/config.h.win32
index 02c7c2d295..6cc50556c1 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -40,30 +40,19 @@
 #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@
@@ -72,13 +61,14 @@
 @HAVE_REMOTE@
 @HAVE_PCAP_REMOTE@
 @HAVE_PCAP_OPEN@
-@HAVE_PCAP_FINDALLDEVS_EX@
-@HAVE_PCAP_CREATESRCSTR@
 @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
 
@@ -100,6 +90,9 @@
 /* Define if you have the <arpa/inet.h> header file.  */
 /* #undef HAVE_ARPA_INET_H */
 
+/* Define if you have the <direct.h> header file.  */
+#define HAVE_DIRECT_H 1
+
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
 
@@ -148,59 +141,15 @@
 /* Define if you have the <unistd.h> header file.  */
 /* #define HAVE_UNISTD_H 1 */
 
+/* Define if you have the <windows.h> header file.  */
+#define HAVE_WINDOWS_H 1
+
+/* Define if you have the <winsock2.h> header file.  */
+#define HAVE_WINSOCK2_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 */
-
-/* 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@
 
@@ -246,35 +195,31 @@
 /* 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 for IPv6 */
-@INET6@
-
-#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
 /* 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 strcasecmp		stricmp
+
 #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"