From ec263fd4d2fd602bf3eb75cbf538bc958c73f40f Mon Sep 17 00:00:00 2001 From: David Carlier Date: Sun, 27 Oct 2024 19:24:18 +0000 Subject: [PATCH 1/2] ext/iconv fix solaris/illumos which can support const/non const versions. --- ext/iconv/iconv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 4241b7c2887fb..c914afb22343d 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -43,9 +43,12 @@ #undef iconv #endif -#if defined(__NetBSD__) +#if defined(__NetBSD__) || (defined(__sun) && !defined(_XPG6)) // unfortunately, netbsd has still the old non posix conformant signature // libiconv tends to match the eventual system's iconv too. +// +// When the SUSv3 API is enabled, it switches to the alternative +// iconv api signature. #define ICONV_CONST const #else #define ICONV_CONST From ca66f6aa8c6b8b408cf783643b5d5e330d078f5b Mon Sep 17 00:00:00 2001 From: David Carlier Date: Wed, 6 Nov 2024 20:32:21 +0000 Subject: [PATCH 2/2] trying w/o the feature_tests part ? --- ext/iconv/iconv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index c914afb22343d..90fe2d45be247 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -43,7 +43,7 @@ #undef iconv #endif -#if defined(__NetBSD__) || (defined(__sun) && !defined(_XPG6)) +#if defined(__NetBSD__) || defined(__sun) // unfortunately, netbsd has still the old non posix conformant signature // libiconv tends to match the eventual system's iconv too. //