1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78642: Wrong libiconv version displayed
This commit is contained in:
Christoph M. Becker
2019-10-08 12:11:19 +02:00
+1 -1
View File
@@ -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