From 5b675884ddfcc16aee24a1cae8f4a1b3ff5db6c5 Mon Sep 17 00:00:00 2001 From: Jacob Adams Date: Tue, 24 Jun 2025 15:56:47 -0600 Subject: [PATCH 1/2] iconv fix for illumos distributions --- 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 157ee41a11a05..d2ddd3e3a6615 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -43,7 +43,7 @@ #undef iconv #endif -#if defined(__NetBSD__) +#if defined(__NetBSD__) || defined (__illumos__) // unfortunately, netbsd has still the old non posix conformant signature // libiconv tends to match the eventual system's iconv too. #define ICONV_CONST const From 9f2ca63f9dae213cb7ab42b5e617fba3bd23a4bc Mon Sep 17 00:00:00 2001 From: Jacob Adams Date: Tue, 16 Sep 2025 13:15:19 -0600 Subject: [PATCH 2/2] ICONV fix to support more solaris distros --- 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 f362af0ad232e..2b19b1e3c7828 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -43,7 +43,7 @@ #undef iconv #endif -#if defined(__NetBSD__) || defined (__illumos__) +#if defined(__NetBSD__) || (defined(__sun) && defined(__SVR4)) // unfortunately, netbsd has still the old non posix conformant signature // libiconv tends to match the eventual system's iconv too. #define ICONV_CONST const