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.
php · Nov 9, 2020 · 8eaaabd · 8eaaabd
1 parent 2cab085
commit 8eaaabd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -2254,6 +2254,8 @@ AC_DEFUN([PHP_SETUP_ICU],[
       fi
     fi
   fi
+
+  ICU_CFLAGS="$ICU_CFLAGS -DU_DEFINE_FALSE_AND_TRUE=1"
 ])
 
 dnl