dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

inflateReset and inflateInit are now the same thing,

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1276 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
justin1014 2002-10-02 17:23:46 +00:00
parent 4e6828b511
commit d7138bf7aa
3 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/zlib/INFBLOCK.C
View file

@ -25,7 +25,7 @@ void inflateReset(z_streamp z)
s->mode = TYPE; s->mode = TYPE;
s->bitk = s->bitb = 0; s->bitk = s->bitb = 0;
s->read = s->write = s->window; s->read = s->write = s->window;
Tracev((stderr, "inflate: blocks reset\n")); s->end = s->window + (1 << DEF_WBITS);
} }
int inflate(z_streamp z) int inflate(z_streamp z)

27
Source/zlib/INFLATE.C
View file

@ -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

3
Source/zlib/ZLIB.H
View file

@ -238,8 +238,9 @@ typedef z_stream FAR *z_streamp;
ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); 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); int ZEXPORT inflate(z_streamp z);
ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,