Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fixed bug #80310: Support for icu4c 68.1.
This commit is contained in:
Nikita Popov 2020-11-09 14:35:40 +01:00
commit 4cd393453a

View file

@ -1893,6 +1893,8 @@ AC_DEFUN([PHP_SETUP_ICU],[
if test "$PKG_CONFIG icu-io --atleast-version=60"; then
ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
fi
ICU_CFLAGS="$ICU_CFLAGS -DU_DEFINE_FALSE_AND_TRUE=1"
])
dnl