diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:10:53 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:10:53 +1000 |
| commit | aef684da3149eaf2b8d87c4903af241c9a2311a6 (patch) | |
| tree | 5b383bca4046f59b243293e721b730f860fb86ec /source4/lib/zlib/deflate.c | |
| parent | 47d80366bef5e62b6727a574b2300cc94a2e18f7 (diff) | |
| parent | 4422617f7a5c36740263397b1672f75efe879520 (diff) | |
| download | samba-aef684da3149eaf2b8d87c4903af241c9a2311a6.tar.gz samba-aef684da3149eaf2b8d87c4903af241c9a2311a6.tar.bz2 samba-aef684da3149eaf2b8d87c4903af241c9a2311a6.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 27d07df301d60e49d36efd003f2fd2305c83c3fe)
Diffstat (limited to 'source4/lib/zlib/deflate.c')
| -rw-r--r-- | source4/lib/zlib/deflate.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/zlib/deflate.c b/source4/lib/zlib/deflate.c index 29ce1f64a5..2720aab911 100644 --- a/source4/lib/zlib/deflate.c +++ b/source4/lib/zlib/deflate.c @@ -154,9 +154,6 @@ local const config configuration_table[10] = { * meaning. */ -#define EQUAL 0 -/* result of memcmp for equal strings */ - #ifndef NO_DUMMY_DECL struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ #endif @@ -297,7 +294,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || s->pending_buf == Z_NULL) { s->status = FINISH_STATE; - strm->msg = (char*)ERR_MSG(Z_MEM_ERROR); + strm->msg = ERR_MSG(Z_MEM_ERROR); deflateEnd (strm); return Z_MEM_ERROR; } @@ -1226,6 +1223,9 @@ local uInt longest_match_fast(s, cur_match) } #ifdef DEBUG +#define EQUAL 0 +/* result of memcmp for equal strings */ + /* =========================================================================== * Check that the match at match_start is indeed a match. */ |