diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-23 05:50:10 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-23 05:50:10 +0000 |
| commit | d8310ff499f128fddcce7d8d7806a36c94684b82 (patch) | |
| tree | 45321553d9af0e403ccc88032bc5dc2684cf0944 | |
| parent | 7cdf98c245f5e5d126ad614d64a1048356e9f1da (diff) | |
| download | wireshark-d8310ff499f128fddcce7d8d7806a36c94684b82.tar.gz | |
Assume we HAVE_GZCLEARERR on Windows and when using cmake
svn path=/trunk/; revision=34192
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 3 | ||||
| -rw-r--r-- | config.nmake | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 3b328d78b6..5318820077 100644 --- 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 953f9f3bac..77c562b061 100644 --- 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 f6e7885fe8..e73db4c337 100644 --- 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= |