diff options
| author | tijl <tijl@FreeBSD.org> | 2015-04-30 16:08:47 +0000 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2015-04-30 16:08:47 +0000 |
| commit | b709ec868adb5170d09bc5a66b18d0e0d5987ab6 (patch) | |
| tree | c67e00b5fe571ffc8b53045db12739794a0aa566 /lib/libiconv_modules/ZW/citrus_zw.c | |
| parent | de0424ce2628044461b3970c30ea52cd23d4a937 (diff) | |
| download | FreeBSD-src-b709ec868adb5170d09bc5a66b18d0e0d5987ab6.zip FreeBSD-src-b709ec868adb5170d09bc5a66b18d0e0d5987ab6.tar.gz | |
MFC r275805:
Fix incorrect type of "invalids" argument in __iconv() prototype.
MFC r281550,281591:
Remove the const qualifier from iconv(3) to comply with POSIX:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html
Adjust all code that calls iconv.
PR: 199099
Diffstat (limited to 'lib/libiconv_modules/ZW/citrus_zw.c')
| -rw-r--r-- | lib/libiconv_modules/ZW/citrus_zw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libiconv_modules/ZW/citrus_zw.c b/lib/libiconv_modules/ZW/citrus_zw.c index 097fcfe..1728e3b 100644 --- a/lib/libiconv_modules/ZW/citrus_zw.c +++ b/lib/libiconv_modules/ZW/citrus_zw.c @@ -107,10 +107,10 @@ _citrus_ZW_unpack_state(_ZWEncodingInfo * __restrict ei __unused, static int _citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char **__restrict s, size_t n, + wchar_t * __restrict pwc, char **__restrict s, size_t n, _ZWState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wc; int ch, len; |
