diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-08 12:11:19 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-08 12:11:19 +0200 |
| commit | 8548a1bdec4dfdda8aaf77025c05d3c814fc5cff (patch) | |
| tree | 75c94d7b4d3c0f76238f8ff6317aa0558a930653 | |
| parent | 1c0ebef819e2a7055342dcc1224aea34edf1f816 (diff) | |
| parent | 346be2cf591ecc5e1f673ead407b265bd834d429 (diff) | |
| download | php-git-8548a1bdec4dfdda8aaf77025c05d3c814fc5cff.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78642: Wrong libiconv version displayed
| -rw-r--r-- | ext/iconv/iconv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index fe815e0bb6..9fab00a746 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -219,7 +219,7 @@ PHP_MINIT_FUNCTION(miconv) { static char buf[16]; snprintf(buf, sizeof(buf), "%d.%d", - ((_libiconv_version >> 8) & 0x0f), (_libiconv_version & 0x0f)); + _libiconv_version >> 8, _libiconv_version & 0xff); version = buf; } #elif HAVE_GLIBC_ICONV |