diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-09 15:24:53 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-09 15:24:53 +0200 |
| commit | 58af1e156e3b3493493fb05a501bc52708badf26 (patch) | |
| tree | cc91bf0c5cc7cdf7858cc353557acc7da7b6cc8a | |
| parent | 229eb15f0e5c3c0b0b85bf90d85ed18316c4dad5 (diff) | |
| parent | 07a4185df1471fe074c5b5212ae3eefe493c3cbb (diff) | |
| download | php-git-58af1e156e3b3493493fb05a501bc52708badf26.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
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 fe9b47aaf4..43e67e0283 100644 --- a/ext/iconv/config.m4 +++ b/ext/iconv/config.m4 @@ -130,7 +130,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; |