diff options
| author | Gerald Carter <jerry@samba.org> | 2005-05-31 13:46:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:57:02 -0500 |
| commit | f24d88cf9da46680d52b42b92bd484e7b09ce99b (patch) | |
| tree | b30342fd7677a0d17306130077995110bfae344a /source3/lib/iconv.c | |
| parent | 450e8d5749504f8392c0cfe8b79218f03b88076a (diff) | |
| download | samba-f24d88cf9da46680d52b42b92bd484e7b09ce99b.tar.gz samba-f24d88cf9da46680d52b42b92bd484e7b09ce99b.tar.bz2 samba-f24d88cf9da46680d52b42b92bd484e7b09ce99b.zip | |
r7139: trying to reduce the number of diffs between trunk and 3.0; changing version to 3.0.20pre1
(This used to be commit 9727d05241574042dd3aa8844ae5c701d22e2da1)
Diffstat (limited to 'source3/lib/iconv.c')
| -rw-r--r-- | source3/lib/iconv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c index f23e4351c0..d58165fed0 100644 --- a/source3/lib/iconv.c +++ b/source3/lib/iconv.c @@ -135,7 +135,7 @@ static size_t sys_iconv(void *cd, { #ifdef HAVE_NATIVE_ICONV size_t ret = iconv((iconv_t)cd, - CONST_DISCARD(char **, inbuf), inbytesleft, + (char **)inbuf, inbytesleft, outbuf, outbytesleft); if (ret == (size_t)-1) { int saved_errno = errno; |