summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-09-29 06:23:56 +0000
committerTim Potter <tpot@samba.org>2003-09-29 06:23:56 +0000
commit10ab4ce58abbd9b38bfb43165452cf45005159b4 (patch)
treee2d6a02877e262d0e77990ac7f8787e230f3a939
parent1052b52178fb4ce0e83ddfc48339d68d34fd43c3 (diff)
downloadsamba-10ab4ce58abbd9b38bfb43165452cf45005159b4.tar.gz
samba-10ab4ce58abbd9b38bfb43165452cf45005159b4.tar.bz2
samba-10ab4ce58abbd9b38bfb43165452cf45005159b4.zip
Merge from 3.0:
>iconv isn't const safe. Neither should smb_iconv be. >Jeremy. (This used to be commit 7bd450f8b678e835ba4f9cfdc3d096b04da6f8f7)
-rw-r--r--source3/lib/iconv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index 3d26d7e17c..0326ca7061 100644
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -136,7 +136,7 @@ static size_t sys_iconv(void *cd,
* enough that Samba works on systems that don't have iconv.
**/
size_t smb_iconv(smb_iconv_t cd,
- const char **inbuf, size_t *inbytesleft,
+ char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft)
{
char cvtbuf[2048];