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 /bin | |
| 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 'bin')
| -rw-r--r-- | bin/csh/config.h | 2 | ||||
| -rw-r--r-- | bin/csh/iconv_stub.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/csh/config.h b/bin/csh/config.h index 99f7d0b..99aed5f 100644 --- a/bin/csh/config.h +++ b/bin/csh/config.h @@ -198,7 +198,7 @@ #define HAVE_WCWIDTH 1 /* Define as const if the declaration of iconv() needs const. */ -#define ICONV_CONST const +#define ICONV_CONST /* Support NLS. */ #define NLS 1 diff --git a/bin/csh/iconv_stub.h b/bin/csh/iconv_stub.h index 89e9d0d..a3e069a0 100644 --- a/bin/csh/iconv_stub.h +++ b/bin/csh/iconv_stub.h @@ -30,7 +30,7 @@ #define _ICONV_H_ typedef void *iconv_t; -typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *); +typedef size_t dl_iconv_t(iconv_t, char **, size_t *, char **, size_t *); typedef int dl_iconv_close_t(iconv_t); extern iconv_t dl_iconv_open(const char *, const char *); |
