From b709ec868adb5170d09bc5a66b18d0e0d5987ab6 Mon Sep 17 00:00:00 2001 From: tijl Date: Thu, 30 Apr 2015 16:08:47 +0000 Subject: 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 --- bin/csh/config.h | 2 +- bin/csh/iconv_stub.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') 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 *); -- cgit v1.1