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/zutil.h | |
| parent | 47d80366bef5e62b6727a574b2300cc94a2e18f7 (diff) | |
| parent | 4422617f7a5c36740263397b1672f75efe879520 (diff) | |
| download | samba-aef684da3149eaf2b8d87c4903af241c9a2311a6.tar.gz samba-aef684da3149eaf2b8d87c4903af241c9a2311a6.tar.xz 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/zutil.h')
| -rw-r--r-- | source4/lib/zlib/zutil.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/zlib/zutil.h b/source4/lib/zlib/zutil.h index b7d5eff81b..edd8e0acbb 100644 --- a/source4/lib/zlib/zutil.h +++ b/source4/lib/zlib/zutil.h @@ -56,7 +56,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] #define ERR_RETURN(strm,err) \ - return (strm->msg = (char*)ERR_MSG(err), (err)) + return (strm->msg = ERR_MSG(err), (err)) /* To be used only when the state is known to be valid */ /* common constants */ |