Put the optional objects in EXTRA..SOURCES instead of EXTRA_DIST.

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

diff --git a/config.h.win32 b/config.h.win32
index 74b69607d30fc4ba0dd61259d820f5da91c919de..a463161c5a0824f562cfa6a6ab908a73c228bf8f 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -40,17 +40,6 @@
 #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 */
 
@@ -64,9 +53,11 @@
 @HAVE_PCAP_FINDALLDEVS@
 @HAVE_PCAP_DATALINK_NAME_TO_VAL@
 @HAVE_PCAP_DATALINK_VAL_TO_NAME@
+@HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION@
 @HAVE_LIBWIRESHARKDLL@
 
 @HAVE_PCAP_LIST_DATALINKS@
+@HAVE_PCAP_FREE_DATALINKS@
 @HAVE_PCAP_SET_DATALINK@
 
 @HAVE_REMOTE@
@@ -149,6 +140,12 @@
 /* Define if you have the <sys/wait.h> 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 <unistd.h> header file.  */
 /* #define HAVE_UNISTD_H 1 */
 
@@ -214,20 +211,18 @@
 
 #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
 
-/* Visual C 9 (2008) now needs these prototypes */
-#if _MSC_VER == 1500
+/* 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 strcasecmp             stricmp
 #define strncasecmp            strnicmp
 #define popen                  _popen
 #define pclose                 _pclose
@@ -248,3 +243,5 @@
 #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
+
+typedef int ssize_t;