diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-09 14:35:40 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-09 14:35:40 +0100 |
| commit | 4cd393453adbb0ec09e7064c572634e739aa2956 (patch) | |
| tree | 61546b1afa459836de800cf95e3c5676d748837c /build | |
| parent | 114613dc5f0ad3dd3914e6a03f138f3525465dc0 (diff) | |
| parent | 96b725122daad0a7d9abe8aad4d14787f8dc15e9 (diff) | |
| download | php-git-4cd393453adbb0ec09e7064c572634e739aa2956.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
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 16c5e25fba..9868c046a6 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 |