Move dissector add sanity check to separate function

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

diff --git a/config.h.win32 b/config.h.win32
index 6c364cc2eaad7843230c98d7ece31ca1c59bcf95..6cc50556c176d3f742c312b137ac5ad548b3da8b 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 */
 
@@ -161,56 +150,6 @@
 /* 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@
 
@@ -256,26 +195,27 @@
 /* Define to have GeoIP */
 @HAVE_GEOIP@
 
-#ifndef WIN32
-#define WIN32                  1
-#endif
-
 /* 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_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
 #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