summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-11-09 14:35:48 +0100
committerNikita Popov <nikita.ppv@gmail.com>2020-11-09 14:35:48 +0100
commit5143b4d8aa0ff700fc8f79b3c652cf54c71c048d (patch)
tree7359f91ece214633eaf676329eda74f2f7287153 /build
parent3e7acf901db76f4dd63ee46e93fbf0e4b2982c2f (diff)
parent4cd393453adbb0ec09e7064c572634e739aa2956 (diff)
downloadphp-git-5143b4d8aa0ff700fc8f79b3c652cf54c71c048d.tar.gz
Merge branch 'PHP-8.0'
* PHP-8.0: Fixed bug #80310: Support for icu4c 68.1.
Diffstat (limited to 'build')
-rw-r--r--build/php.m42
1 files changed, 2 insertions, 0 deletions
diff --git a/build/php.m4 b/build/php.m4
index fe2f176e3c..a8f0b9e21c 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -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