Skip to content

Commit 9fe6fb2

Browse files
Jacob Adamsdevnexen
authored andcommitted
ext/iconv: Build fix for illumos distributions and solaris
close GH-18933
1 parent 1f6ac30 commit 9fe6fb2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ PHP NEWS
3434
. Fixed GH-8157 (post_max_size evaluates .user.ini too late in php-fpm).
3535
(Jakub Zelenka)
3636

37+
- Iconv:
38+
. Extends the ICONV_CONST preprocessor for illumos/solaris. (jMichaelA)
39+
3740
- Opcache:
3841
. Fixed bug GH-19669 (assertion failure in zend_jit_trace_type_to_info_ex).
3942
(Arnaud)

ext/iconv/iconv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#undef iconv
4444
#endif
4545

46-
#if defined(__NetBSD__)
46+
#if defined(__NetBSD__) || (defined(__sun) && defined(__SVR4))
4747
// unfortunately, netbsd has still the old non posix conformant signature
4848
// libiconv tends to match the eventual system's iconv too.
4949
#define ICONV_CONST const

0 commit comments

Comments
 (0)