From 7a0b8a9a6e785de7024ba873414bbd656e161750 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 26 Feb 2014 20:16:26 +0100 Subject: s3:registry: use discard_const_p() to avoid const warning in smb_iconv() define I'm wondering why we have this in reg_parse_internal.h at all! But for now just fix warnings... Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison --- source3/registry/reg_parse_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/registry/reg_parse_internal.h b/source3/registry/reg_parse_internal.h index bd364a5851..1440d5549f 100644 --- a/source3/registry/reg_parse_internal.h +++ b/source3/registry/reg_parse_internal.h @@ -38,7 +38,7 @@ struct cbuf; #if defined USE_NATIVE_ICONV && defined HAVE_NATIVE_ICONV # define smb_iconv_t iconv_t # define smb_iconv(CD, IPTR, ILEN, OPTR, OLEN) \ - iconv(CD, (char**)(IPTR), ILEN, OPTR, OLEN) + iconv(CD, discard_const_p(char*, (IPTR)), ILEN, OPTR, OLEN) # define smb_iconv_open iconv_open # define smb_iconv_close iconv_close #endif -- cgit