diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-04-29 17:30:23 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-04-29 17:30:23 +0000 |
| commit | 6ff4737f44838d6eea28d12a538c1b61c2c13075 (patch) | |
| tree | a6d90543b199335915c93bed8b61e900d8159b72 | |
| parent | 5505ef78ee65552523ffccbefa197f2c0800b04a (diff) | |
On Windows: don't (try but fail--the code did not work) to define
HAVE_GZLCEARERR. Define HAVE_INFLATEPRIME if we HAVE_LIBZ.
svn path=/trunk/; revision=36954
| -rw-r--r-- | config.h.win32 | 3 | ||||
| -rw-r--r-- | config.nmake | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config.h.win32 b/config.h.win32 index a39e85dc41..cac7958938 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -170,6 +170,9 @@ /* Define if you have the z library (-lz). */ @HAVE_LIBZ@ +#ifdef HAVE_LIBZ +#define HAVE_INFLATEPRIME 1 +#endif /* Define to use GNU ADNS library */ @HAVE_C_ARES@ diff --git a/config.nmake b/config.nmake index 4f50330ca7..e3da7c1f54 100644 --- a/config.nmake +++ b/config.nmake @@ -1138,7 +1138,6 @@ 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= |