diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-09 14:34:24 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-09 14:34:24 +0100 |
| commit | 96b725122daad0a7d9abe8aad4d14787f8dc15e9 (patch) | |
| tree | 8354ac3254f8b86a0b4fa1d1021fa960e5a469fe /build | |
| parent | 25643b56a21a26f158895cb2006c2eceb61a1bc9 (diff) | |
| parent | 8eaaabdd58a395853d3658418622ee24635cb871 (diff) | |
| download | php-git-96b725122daad0a7d9abe8aad4d14787f8dc15e9.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #80310: Support for icu4c 68.1.
Diffstat (limited to 'build')
| -rw-r--r-- | build/php.m4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build/php.m4 b/build/php.m4 index bc5286b36d..3e19937b9c 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -1907,6 +1907,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 |