diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:11:51 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:11:51 +1000 |
| commit | b33f4541f6157163f9b22af8607ecefe3953638f (patch) | |
| tree | cb36a27033500dff5790789e696a4d24bf8ec30f /source4/lib/zlib/zutil.h | |
| parent | 7ef21658fbb519859aa7d23a614e1fdbcae95693 (diff) | |
| parent | aef684da3149eaf2b8d87c4903af241c9a2311a6 (diff) | |
| download | samba-b33f4541f6157163f9b22af8607ecefe3953638f.tar.gz samba-b33f4541f6157163f9b22af8607ecefe3953638f.tar.bz2 samba-b33f4541f6157163f9b22af8607ecefe3953638f.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit fc6b4f03ebba015a13a6ab93221b0bc3ef8ef2ed)
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 */ |