diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:54:30 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:54:30 +1000 |
| commit | 5631ebaf78fee35880aafe29578b8925c655e5f4 (patch) | |
| tree | 8a9bceb40f3f4839dc1cc8a5ac38982536911d7f /source4/lib/zlib/deflate.c | |
| parent | fe95409de76cf64bb65dbc9ce1ed2ddf9774a896 (diff) | |
| parent | b33f4541f6157163f9b22af8607ecefe3953638f (diff) | |
| download | samba-5631ebaf78fee35880aafe29578b8925c655e5f4.tar.gz samba-5631ebaf78fee35880aafe29578b8925c655e5f4.tar.bz2 samba-5631ebaf78fee35880aafe29578b8925c655e5f4.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit a6146cc14ba950b1911094b1525c7d06b50ecec6)
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. */ |