diff options
| author | Jeremy Allison <jra@samba.org> | 2005-10-18 03:24:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:02 -0500 |
| commit | 8d7c88667190fe286971ac4fffb64ee5bd9eeeb0 (patch) | |
| tree | d5b2f0850d63a07e051c03a7abe1f10884598161 /source3/lib/iconv.c | |
| parent | afca439d19e3d9e67b127d7060df630e2218bcb2 (diff) | |
| download | samba-8d7c88667190fe286971ac4fffb64ee5bd9eeeb0.tar.gz samba-8d7c88667190fe286971ac4fffb64ee5bd9eeeb0.tar.bz2 samba-8d7c88667190fe286971ac4fffb64ee5bd9eeeb0.zip | |
r11137: Compile with only 2 warnings (I'm still working on that code) on a gcc4
x86_64 box.
Jeremy.
(This used to be commit d720867a788c735e56d53d63265255830ec21208)
Diffstat (limited to 'source3/lib/iconv.c')
| -rw-r--r-- | source3/lib/iconv.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c index d58165fed0..f738f45efa 100644 --- a/source3/lib/iconv.c +++ b/source3/lib/iconv.c @@ -642,15 +642,15 @@ static size_t utf8_pull(void *cd, const char **inbuf, size_t *inbytesleft, *inbytesleft = in_left; *outbytesleft = out_left; - *inbuf = c; - *outbuf = uc; + *inbuf = (char *)c; + *outbuf = (char *)uc; return 0; error: *inbytesleft = in_left; *outbytesleft = out_left; - *inbuf = c; - *outbuf = uc; + *inbuf = (char *)c; + *outbuf = (char *)uc; return -1; } @@ -755,16 +755,16 @@ static size_t utf8_push(void *cd, const char **inbuf, size_t *inbytesleft, *inbytesleft = in_left; *outbytesleft = out_left; - *inbuf = uc; - *outbuf = c; + *inbuf = (char *)uc; + *outbuf = (char *)c; return 0; error: *inbytesleft = in_left; *outbytesleft = out_left; - *inbuf = uc; - *outbuf = c; + *inbuf = (char *)uc; + *outbuf = (char *)c; return -1; } |