dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zlib: minimize diffs with upstream to prepare zlib upgrade

Browse Source
This commit is contained in:
Philippe Teuwen
2019-09-22 17:24:29 +02:00
parent f30511f1a2
commit b6d074cc9f
19 changed files with 122 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/zlib/inflate.c
View File

@@ -80,15 +80,6 @@
* The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
*/
//-----------------------------------------------------------------------------
// This version of zlib is modified for use within the Proxmark3 project.
// Files from the original distribution which are not required for this
// purpose are not included. All modifications can easily be found
// by searching for #ifdef ZLIB_PM3_TUNED and #ifndef ZLIB_PM3_TUNED.
//-----------------------------------------------------------------------------
#include "zutil.h"
#include "inftrees.h"
#include "inflate.h"
@@ -1520,3 +1511,4 @@ z_streamp strm;
(state->mode == COPY ? state->length :
(state->mode == MATCH ? state->was - state->length : 0));
}