Patch php-7.3.24-def_true_false-1.patch for Compile Failure Bug #80361

Patch version 2020-11-13 13:55 UTC

• 2020-11-13 13:55 UTC [diff to current]

Developer: stuff@decentral.ch

diff -ru php-7.3.24/ext/intl/breakiterator/codepointiterator_internal.cpp php-7.3.24-def_true_false/ext/intl/breakiterator/codepointiterator_internal.cpp
--- php-7.3.24/ext/intl/breakiterator/codepointiterator_internal.cpp	2020-10-27 12:02:01.000000000 +0100
+++ php-7.3.24-def_true_false/ext/intl/breakiterator/codepointiterator_internal.cpp	2020-11-13 14:37:13.964667704 +0100
@@ -18,6 +18,9 @@
 #include <unicode/uchriter.h>
 #include <typeinfo>
 
+#define TRUE 1
+#define FALSE 0
+
 #include "php.h"
 
 //copied from cmemory.h, which is not public
diff -ru php-7.3.24/ext/intl/collator/collator_sort.c php-7.3.24-def_true_false/ext/intl/collator/collator_sort.c
--- php-7.3.24/ext/intl/collator/collator_sort.c	2020-10-27 12:02:01.000000000 +0100
+++ php-7.3.24-def_true_false/ext/intl/collator/collator_sort.c	2020-11-13 14:33:02.490485446 +0100
@@ -14,6 +14,8 @@
    |          Dmitry Lakhtyuk <dlakhtyuk@productengine.com>               |
    +----------------------------------------------------------------------+
  */
+#define TRUE 1
+#define FALSE 0
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff -ru php-7.3.24/ext/intl/dateformat/dateformat_attr.c php-7.3.24-def_true_false/ext/intl/dateformat/dateformat_attr.c
--- php-7.3.24/ext/intl/dateformat/dateformat_attr.c	2020-10-27 12:02:01.000000000 +0100
+++ php-7.3.24-def_true_false/ext/intl/dateformat/dateformat_attr.c	2020-11-13 14:35:32.733594411 +0100
@@ -16,6 +16,8 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#define TRUE 1
+#define FALSE 0
 
 #include "../php_intl.h"
 #include "dateformat_class.h"
diff -ru php-7.3.24/ext/intl/normalizer/normalizer_normalize.c php-7.3.24-def_true_false/ext/intl/normalizer/normalizer_normalize.c
--- php-7.3.24/ext/intl/normalizer/normalizer_normalize.c	2020-10-27 12:02:01.000000000 +0100
+++ php-7.3.24-def_true_false/ext/intl/normalizer/normalizer_normalize.c	2020-11-13 14:33:51.457520974 +0100
@@ -17,6 +17,8 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#define TRUE 1
+#define FALSE 0
 
 #include "php_intl.h"
 #if U_ICU_VERSION_MAJOR_NUM < 56
diff -ru php-7.3.24/ext/intl/timezone/timezone_class.cpp php-7.3.24-def_true_false/ext/intl/timezone/timezone_class.cpp
--- php-7.3.24/ext/intl/timezone/timezone_class.cpp	2020-10-27 12:02:01.000000000 +0100
+++ php-7.3.24-def_true_false/ext/intl/timezone/timezone_class.cpp	2020-11-13 14:36:15.091625074 +0100
@@ -18,6 +18,8 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#define TRUE 1
+#define FALSE 0
 
 #include "../intl_cppshims.h"
 
diff -ru php-7.3.24/ext/intl/timezone/timezone_methods.cpp php-7.3.24-def_true_false/ext/intl/timezone/timezone_methods.cpp
--- php-7.3.24/ext/intl/timezone/timezone_methods.cpp	2020-10-27 12:02:01.000000000 +0100
+++ php-7.3.24-def_true_false/ext/intl/timezone/timezone_methods.cpp	2020-11-13 14:36:38.242641852 +0100
@@ -18,6 +18,9 @@
 #include "config.h"
 #endif
 
+#define TRUE 1
+#define FALSE 0
+
 #include "../intl_cppshims.h"
 
 #include <unicode/locid.h>