Assume we HAVE_GZCLEARERR on Windows and when using cmake

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34192 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.nmake b/Makefile.nmake
index 3b328d78b64b3f8d74b132bdda419f679b54f8d6..5318820077b2169ca3dd9c351e81960403efbc5d 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -359,6 +359,7 @@ config.h    : config.h.win32 config.nmake
            -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \
            -e "s/@HAVE_NETTLE@/$(NETTLE_CONFIG)/" \
            -e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \
+           -e "s/@HAVE_GZCLEARERR@/$(ZLIB_GZCLEARERR_CONFIG)/" \
            -e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \
            -e "s/@HAVE_PCAP_FINDALLDEVS@/$(PCAP_FINDALLDEVS_CONFIG)/" \
            -e "s/@HAVE_PCAP_DATALINK_NAME_TO_VAL@/$(PCAP_DATALINK_NAME_TO_VAL_CONFIG)/" \

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 953f9f3bac5d7e585a2521e94b03746e1f244641..77c562b06189bd040cfa6140487d13a273d16cb2 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -111,6 +111,9 @@
 /* Define to use libz library */
 #cmakedefine HAVE_LIBZ 1
 
+/* Define to 1 if you have the `gzclearerr' function */
+#cmakedefine HAVE_GZCLEARERR 1
+
 /* Define to 1 if you have the <lua5.1/lauxlib.h> header file. */
 #cmakedefine HAVE_LUA5_1_LAUXLIB_H 1
 

diff --git a/config.nmake b/config.nmake
index f6e7885fe82232bb1331d19184a22e5d5dee0e01..e73db4c337bd5d9d2045391aac8c84134dbe1668 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1071,6 +1071,7 @@ ZLIB_LIBS=$(ZLIB_DIR)\lib\zdll.lib
 ZLIB_DLL=$(ZLIB_DIR)\zlib1.dll
 # Nmake uses carets to escape special characters
 ZLIB_CONFIG=^#define HAVE_LIBZ 1
+ZLIB_GZCLEARERR_CONFIG=^#define HAVE_GZCLEARERR 1
 !else
 ZLIB_CFLAGS=
 ZLIB_LIBS=