diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-08-12 09:05:58 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-08-12 09:05:58 -0700 |
| commit | 1d238bc75ac833eb28a72f24cc1acd79ec5999d7 (patch) | |
| tree | 65fb7ea2c7cdb66d40fbbce440e4623975c9568f /src/decompress.c | |
| parent | 01f1a9ab4f3eedbbf99140195c2530b7c242de4f (diff) | |
| download | emacs-1d238bc75ac833eb28a72f24cc1acd79ec5999d7.tar.gz | |
Minor zlib configuration tweaks.
* configure.ac (HAVE_ZLIB): Don't assume zlib is linked if PNG is.
* src/decompress.c (fn_inflateInit2) [!WINDOWSNT]:
Don't assume presence of fn_inflateInit2_ zlib internal function.
Diffstat (limited to 'src/decompress.c')
| -rw-r--r-- | src/decompress.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/decompress.c b/src/decompress.c index 3605d446e5a..4e4e3a9c7dc 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -67,17 +67,17 @@ init_zlib_functions (void) return 1; } +#define fn_inflateInit2(strm, windowBits) \ + fn_inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream)) + #else /* !WINDOWSNT */ -#define fn_inflateInit2_ inflateInit2_ +#define fn_inflateInit2 inflateInit2 #define fn_inflate inflate #define fn_inflateEnd inflateEnd #endif /* WINDOWSNT */ -#define fn_inflateInit2(strm, windowBits) \ - fn_inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream)) - struct decompress_unwind_data { |