diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-05-07 21:58:34 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-05-07 21:58:34 -0500 |
| commit | c740211ffba3330d951f4c3ddefea8edf23a01cd (patch) | |
| tree | 0a8b7641d3c5b576d18a2f7912c75fc600f494e2 /src/3rdparty/zlib | |
| parent | 8a4eacb6185de3653f6ae401c352aef833a9e72a (diff) | |
| download | tqt3-c740211ffba3330d951f4c3ddefea8edf23a01cd.tar.gz tqt3-c740211ffba3330d951f4c3ddefea8edf23a01cd.zip | |
Automated update from Qt3
Diffstat (limited to 'src/3rdparty/zlib')
| -rw-r--r-- | src/3rdparty/zlib/deflate.c | 4 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zlib.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/zlib/deflate.c b/src/3rdparty/zlib/deflate.c index c7f75a3ec..0fc53bc1e 100644 --- a/src/3rdparty/zlib/deflate.c +++ b/src/3rdparty/zlib/deflate.c @@ -154,7 +154,7 @@ local const config configuration_table[10] = { * meaning. */ -#define ETQUAL 0 +#define EQUAL 0 /* result of memcmp for equal strings */ #ifndef NO_DUMMY_DECL @@ -1064,7 +1064,7 @@ local void check_match(s, start, match, length) { /* check that the match is indeed a match */ if (zmemcmp(s->window + match, - s->window + start, length) != ETQUAL) { + s->window + start, length) != EQUAL) { fprintf(stderr, " start %u, match %u, length %d\n", start, match, length); do { diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h index 4c01661b0..c563991e7 100644 --- a/src/3rdparty/zlib/zlib.h +++ b/src/3rdparty/zlib/zlib.h @@ -590,7 +590,7 @@ ZEXTERN int Q_ZEXPORT deflateParams OF((z_streamp strm, Dynamically update the compression level and compression strategy. The interpretation of level and strategy is as in deflateInit2. This can be used to switch between compression and straight copy of the input data, or - to switch to a different kind of input data retquiring a different + to switch to a different kind of input data requiring a different strategy. If the compression level is changed, the input available so far is compressed with the old level (and may be flushed); the new level will take effect only at the next call of deflate(). |