diff --git a/Source/zlib/INFBLOCK.C b/Source/zlib/INFBLOCK.C index 0b66da89..892f9e77 100644 --- a/Source/zlib/INFBLOCK.C +++ b/Source/zlib/INFBLOCK.C @@ -25,7 +25,7 @@ void inflateReset(z_streamp z) s->mode = TYPE; s->bitk = s->bitb = 0; s->read = s->write = s->window; - Tracev((stderr, "inflate: blocks reset\n")); + s->end = s->window + (1 << DEF_WBITS); } int inflate(z_streamp z) diff --git a/Source/zlib/INFLATE.C b/Source/zlib/INFLATE.C deleted file mode 100644 index 7a9689a4..00000000 --- a/Source/zlib/INFLATE.C +++ /dev/null @@ -1,27 +0,0 @@ -#include "../exehead/config.h" -#ifdef NSIS_COMPRESS_USE_ZLIB -/* inflate.c -- zlib interface to inflate modules - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - - * this has been HEAVILY modified for NSIS use, and is no longer compatible - * with the stock zlib. - - */ - -#include "zutil.h" -#include "infblock.h" -#include "inftrees.h" -#include "infcodes.h" -#include "infutil.h" - -void inflateInit(z_streamp z) -{ - z->blocks.end = z->blocks.window + (1 << DEF_WBITS); - z->blocks.mode = TYPE; - - inflateReset(z); -} - - -#endif diff --git a/Source/zlib/ZLIB.H b/Source/zlib/ZLIB.H index 7012d1f1..17ef357f 100644 --- a/Source/zlib/ZLIB.H +++ b/Source/zlib/ZLIB.H @@ -238,8 +238,9 @@ typedef z_stream FAR *z_streamp; ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); -ZEXTERN void ZEXPORT inflateInit OF((z_streamp strm)); + +#define inflateInit(x) inflateReset(x) int ZEXPORT inflate(z_streamp z); ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,