Remove strcasecmp. We use g_ascii_strcasecmp exclusively

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

diff --git a/config.h.win32 b/config.h.win32
index fd93726b6cb2af24faec40171ddb9e0ea79bf6d8..eff90988ca5733a29070b4af5e55102128ac0480 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -72,8 +72,6 @@
 @HAVE_REMOTE@
 @HAVE_PCAP_REMOTE@
 @HAVE_PCAP_OPEN@
-@HAVE_PCAP_FINDALLDEVS_EX@
-@HAVE_PCAP_CREATESRCSTR@
 @HAVE_PCAP_SETSAMPLING@
 
 @HAVE_AIRPCAP@
@@ -163,56 +161,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@
 
@@ -258,34 +206,31 @@
 /* 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
 
-/* Needed for zlib, according to http://www.winimage.com/zLibDll/ */
-/*#define ZLIB_DLL                1
-#define _WINDOWS                1*/
-
 /* Name of package */
 #define PACKAGE "wireshark"