summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander M. Turek <me@derrabus.de>2020-11-03 19:14:41 +0100
committerNikita Popov <nikita.ppv@gmail.com>2020-11-09 14:31:29 +0100
commit8eaaabdd58a395853d3658418622ee24635cb871 (patch)
treed31883b090df03fbced46e71a083cc2349cbf752
parent2cab085bb37a6980b8f23a4b3c31b813ac67cda0 (diff)
downloadphp-git-8eaaabdd58a395853d3658418622ee24635cb871.tar.gz
Fixed bug #80310: Support for icu4c 68.1.
On stable versions, bring back the TRUE/FALSE defines by defining _U_DEFINE_TRUE_AND_FALSE. Closes GH-6397.
-rw-r--r--NEWS4
-rw-r--r--acinclude.m42
2 files changed, 6 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 4513508271..96def0900a 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,10 @@ PHP NEWS
. Fixed bug #80242 (imap_mail_compose() segfaults for multipart with rfc822).
(cmb)
+- Intl:
+ . Fixed bug #80310 (ext-intl with icu4c 68.1: use of undeclared identifier
+ 'TRUE'). (Alexander M. Turek)
+
- ODBC:
. Fixed bug #44618 (Fetching may rely on uninitialized data). (cmb)
diff --git a/acinclude.m4 b/acinclude.m4
index f9f6b08f56..e1e272fa24 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2254,6 +2254,8 @@ AC_DEFUN([PHP_SETUP_ICU],[
fi
fi
fi
+
+ ICU_CFLAGS="$ICU_CFLAGS -DU_DEFINE_FALSE_AND_TRUE=1"
])
dnl