diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-09 15:25:23 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-09 15:25:23 +0200 |
| commit | 64cebf3d9a8e9bd5f8589c336c9ec9c82fe296fe (patch) | |
| tree | 26a007ae8f5a4bc7e9121e14f773dca867d7d68b | |
| parent | 080784acfd3e91da25ea9d28d555c7b34e0811b1 (diff) | |
| parent | 58af1e156e3b3493493fb05a501bc52708badf26 (diff) | |
| download | php-git-64cebf3d9a8e9bd5f8589c336c9ec9c82fe296fe.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Make iconv errno support test pass on Solaris.
| -rw-r--r-- | ext/iconv/config.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 index d5ef64022a..ac57c81e7d 100644 --- a/ext/iconv/config.m4 +++ b/ext/iconv/config.m4 @@ -92,7 +92,7 @@ int main() { int main() { iconv_t cd; - cd = iconv_open( "*blahblah*", "*blahblah*" ); + cd = iconv_open( "*blahblah*", "*blahblahblah*" ); if (cd == (iconv_t)(-1)) { if (errno == EINVAL) { return 0; |