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 /include | |
| 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 'include')
| -rw-r--r-- | include/iconv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/iconv.h b/include/iconv.h index c07d02e..51f0603 100644 --- a/include/iconv.h +++ b/include/iconv.h @@ -53,7 +53,7 @@ typedef struct __tag_iconv_t *iconv_t; __BEGIN_DECLS iconv_t iconv_open(const char *, const char *); -size_t iconv(iconv_t, const char ** __restrict, +size_t iconv(iconv_t, char ** __restrict, size_t * __restrict, char ** __restrict, size_t * __restrict); int iconv_close(iconv_t); @@ -62,7 +62,7 @@ int iconv_close(iconv_t); */ int __iconv_get_list(char ***, size_t *, __iconv_bool); void __iconv_free_list(char **, size_t); -size_t __iconv(iconv_t, const char **, size_t *, char **, +size_t __iconv(iconv_t, char **, size_t *, char **, size_t *, __uint32_t, size_t *); #define __ICONV_F_HIDE_INVALID 0x0001 |
