From c2b06732cacfc090e5baf14d1dac855c721df9fd Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Thu, 23 Jan 2025 21:14:43 -0800 Subject: [PATCH] uchar-h-c23: Fix compilation error on OmniOS. * lib/lc-charset-unicode.c (locale_encoding_to_unicode) (unicode_to_locale_encoding): Cast the argument to iconv with ICONV_CONST. --- ChangeLog | 7 +++++++ lib/lc-charset-unicode.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed63398f8c..3a1a13fcaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2025-01-23 Collin Funk + + uchar-h-c23: Fix compilation error on OmniOS. + * lib/lc-charset-unicode.c (locale_encoding_to_unicode) + (unicode_to_locale_encoding): Cast the argument to iconv with + ICONV_CONST. + 2025-01-18 Paul Eggert flexmember: port to IBM XL C 16.1 diff --git a/lib/lc-charset-unicode.c b/lib/lc-charset-unicode.c index 4558f9288e..b51a571f27 100644 --- a/lib/lc-charset-unicode.c +++ b/lib/lc-charset-unicode.c @@ -1,5 +1,5 @@ /* Conversion between the current locale's character encoding and Unicode. - Copyright (C) 2023-2024 Free Software Foundation, Inc. + Copyright (C) 2023-2025 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -175,7 +175,7 @@ locale_encoding_to_unicode (wchar_t wc) char *utf8ptr = utf8buf; size_t utf8size = sizeof (utf8buf); size_t ret = iconv (conv->cd_locale_to_utf8, - &mbptr, &mbsize, + (ICONV_CONST char **) &mbptr, &mbsize, &utf8ptr, &utf8size); if (ret == (size_t)(-1)) /* Conversion error. */ @@ -234,7 +234,7 @@ unicode_to_locale_encoding (char32_t uc) char *mbptr = mbbuf; size_t mbsize = sizeof (mbbuf); size_t ret = iconv (conv->cd_utf8_to_locale, - &utf8ptr, &utf8size, + (ICONV_CONST char **) &utf8ptr, &utf8size, &mbptr, &mbsize); if (ret == (size_t)(-1)) /* Conversion error. */ -- 2.39.5