[packages/php.git] / php-icu64.patch

--- php-5.5.38.orig/ext/intl/breakiterator/breakiterator_class.cpp	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/breakiterator/breakiterator_class.cpp	2019-04-18 09:26:37.409910360 +0200
@@ -38,6 +38,7 @@
 }
 
 using PHP::CodePointBreakIterator;
+using icu::RuleBasedBreakIterator;
 
 /* {{{ Global variables */
 zend_class_entry *BreakIterator_ce_ptr;
--- php-5.5.38.orig/ext/intl/breakiterator/breakiterator_class.h	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/breakiterator/breakiterator_class.h	2019-04-18 09:27:25.925787455 +0200
@@ -26,6 +26,8 @@
 
 #ifndef USE_BREAKITERATOR_POINTER
 typedef void BreakIterator;
+#else
+using icu::BreakIterator;
 #endif
 
 typedef struct {
--- php-5.5.38.orig/ext/intl/breakiterator/breakiterator_methods.cpp	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/breakiterator/breakiterator_methods.cpp	2019-04-18 09:30:32.998928523 +0200
@@ -32,6 +32,8 @@
 }
 
 using PHP::CodePointBreakIterator;
+using icu::BreakIterator;
+using icu::Locale;
 
 U_CFUNC PHP_METHOD(BreakIterator, __construct)
 {
--- php-5.5.38.orig/ext/intl/breakiterator/codepointiterator_internal.cpp	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/breakiterator/codepointiterator_internal.cpp	2019-04-18 09:24:40.240427586 +0200
@@ -30,6 +30,7 @@
 #define U_ALIGNMENT_OFFSET_UP(ptr) (sizeof(UAlignedMemory) - U_ALIGNMENT_OFFSET(ptr))
 
 using namespace PHP;
+using icu::UCharCharacterIterator;
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
 
--- php-5.5.38.orig/ext/intl/breakiterator/codepointiterator_internal.h	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/breakiterator/codepointiterator_internal.h	2019-04-18 09:25:57.127796222 +0200
@@ -18,8 +18,11 @@
 #define CODEPOINTITERATOR_INTERNAL_H
 
 #include <unicode/brkiter.h>
+#include <unicode/unistr.h>
 
-using U_ICU_NAMESPACE::BreakIterator;
+using icu::BreakIterator;
+using icu::CharacterIterator;
+using icu::UnicodeString;
 
 namespace PHP {
 
--- php-5.5.38.orig/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp	2019-04-18 09:30:55.920130219 +0200
@@ -25,6 +25,9 @@
 
 #include "../ext/intl_convertcpp.h"
 
+using icu::RuleBasedBreakIterator;
+using icu::Locale;
+
 static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) {
 	return (RuleBasedBreakIterator*)bio->biter;
 }
--- php-5.5.38.orig/ext/intl/calendar/calendar_class.cpp	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/calendar/calendar_class.cpp	2019-04-18 09:21:08.825998526 +0200
@@ -34,6 +34,9 @@
 #include <assert.h>
 }
 
+using icu::GregorianCalendar;
+using icu::Locale;
+
 /* {{{ Global variables */
 zend_class_entry *Calendar_ce_ptr;
 zend_class_entry *GregorianCalendar_ce_ptr;
--- php-5.5.38.orig/ext/intl/calendar/calendar_class.h	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/calendar/calendar_class.h	2019-04-18 08:51:22.553104240 +0200
@@ -26,6 +26,8 @@
 
 #ifndef USE_CALENDAR_POINTER
 typedef void Calendar;
+#else
+using icu::Calendar;
 #endif
 
 typedef struct {
--- php-5.5.38.orig/ext/intl/calendar/calendar_methods.cpp	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/calendar/calendar_methods.cpp	2019-04-18 09:21:37.634177141 +0200
@@ -40,6 +40,8 @@
 }
 #include "../common/common_enum.h"
 
+using icu::Locale;
+
 U_CFUNC PHP_METHOD(IntlCalendar, __construct)
 {
 	zend_throw_exception( NULL,
--- php-5.5.38.orig/ext/intl/calendar/gregoriancalendar_methods.cpp	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/calendar/gregoriancalendar_methods.cpp	2019-04-18 09:23:00.341851246 +0200
@@ -32,6 +32,11 @@
 #include <ext/date/php_date.h>
 }
 
+using icu::GregorianCalendar;
+using icu::Locale;
+using icu::UnicodeString;
+using icu::StringPiece;
+
 static inline GregorianCalendar *fetch_greg(Calendar_object *co) {
 	return (GregorianCalendar*)co->ucal;
 }
--- php-5.5.38.orig/ext/intl/common/common_date.cpp	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/common/common_date.cpp	2019-04-18 08:53:40.357013115 +0200
@@ -17,6 +17,8 @@
 #include "../ext/intl_cppshims.h"
 
 #include <unicode/calendar.h>
+using icu::TimeZone;
+using icu::UnicodeString;
 
 extern "C" {
 #include "../php_intl.h"
--- php-5.5.38.orig/ext/intl/common/common_date.h	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/common/common_date.h	2019-04-18 09:04:53.802375635 +0200
@@ -27,6 +27,7 @@
 #ifdef __cplusplus
 
 #include <unicode/timezone.h>
+using icu::TimeZone;
 
 U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func TSRMLS_DC);
 U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
--- php-5.5.38.orig/ext/intl/common/common_enum.h	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/common/common_enum.h	2019-04-18 08:50:49.214683321 +0200
@@ -69,6 +69,7 @@
 U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter);
 
 #ifdef __cplusplus
+using icu::StringEnumeration;
 U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object);
 #endif
 
--- php-5.5.38.orig/ext/intl/dateformat/dateformat_format_object.cpp	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/dateformat/dateformat_format_object.cpp	2019-04-18 08:55:34.509673920 +0200
@@ -33,6 +33,12 @@
 #include "../common/common_date.h"
 }
 
+using icu::Locale;
+using icu::DateFormat;
+using icu::GregorianCalendar;
+using icu::StringPiece;
+using icu::SimpleDateFormat;
+
 static const DateFormat::EStyle valid_styles[] = {
 		DateFormat::kNone,
 		DateFormat::kFull,
--- php-5.5.38.orig/ext/intl/dateformat/dateformat_helpers.h	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/dateformat/dateformat_helpers.h	2019-04-18 09:07:05.049267391 +0200
@@ -22,11 +22,18 @@
 #endif
 
 #include <unicode/calendar.h>
+
+#include <unicode/datefmt.h>
 
 extern "C" {
 #include "../php_intl.h"
 }
 
+using icu::Locale;
+using icu::Calendar;
+
+using icu::DateFormat;
+
 int datefmt_process_calendar_arg(zval* calendar_zv,
 								 Locale const& locale,
 								 const char *func_name,
--- php-5.5.38.orig/ext/intl/intl_convertcpp.h	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/intl_convertcpp.h	2019-04-18 08:49:50.358252987 +0200
@@ -24,6 +24,7 @@
 
 #include <unicode/unistr.h>
 #include <zend_types.h>
+using icu::UnicodeString;
 
 int intl_stringFromChar(UnicodeString &ret, char *str, int32_t str_len, UErrorCode *status);
 
--- php-5.5.38.orig/ext/intl/msgformat/msgformat_helpers.cpp	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/msgformat/msgformat_helpers.cpp	2019-04-18 09:00:43.482564710 +0200
@@ -27,6 +27,7 @@
 #include <unicode/timezone.h>
 #include <unicode/datefmt.h>
 #include <unicode/calendar.h>
+#include <unicode/strenum.h>
 
 #include <vector>
 
@@ -76,6 +77,16 @@
 #endif
 U_NAMESPACE_END
 
+using icu::Formattable;
+using icu::Format;
+using icu::DateFormat;
+using icu::MessageFormat;
+#ifdef HAS_MESSAGE_PATTERN
+using icu::MessagePattern;
+#endif
+using icu::MessageFormatAdapter;
+using icu::FieldPosition;
+
 U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
 {
 	int32_t fmt_count = 0;
--- php-5.5.38.orig/ext/intl/timezone/timezone_class.cpp	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/timezone/timezone_class.cpp	2019-04-18 09:01:40.738904566 +0200
@@ -37,6 +37,8 @@
 #include <ext/date/php_date.h>
 }
 
+using icu::Calendar;
+
 /* {{{ Global variables */
 U_CDECL_BEGIN
 zend_class_entry *TimeZone_ce_ptr = NULL;
--- php-5.5.38.orig/ext/intl/timezone/timezone_class.h	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/timezone/timezone_class.h	2019-04-18 08:58:02.620784547 +0200
@@ -29,6 +29,8 @@
 
 #ifndef USE_TIMEZONE_POINTER
 typedef void TimeZone;
+#else
+using icu::TimeZone;
 #endif
 
 typedef struct {
--- php-5.5.38.orig/ext/intl/timezone/timezone_methods.cpp	2016-07-20 10:41:48.000000000 +0200
+++ php-5.5.38/ext/intl/timezone/timezone_methods.cpp	2019-04-18 09:20:17.116617981 +0200
@@ -23,6 +23,7 @@
 #include <unicode/locid.h>
 #include <unicode/timezone.h>
 #include <unicode/ustring.h>
+#include <unicode/calendar.h>
 #include "intl_convertcpp.h"
 
 #include "../common/common_date.h"
@@ -37,6 +38,9 @@
 }
 #include "common/common_enum.h"
 
+using icu::Locale;
+using icu::Calendar;
+
 U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
 {
 	zend_throw_exception( NULL,

--- php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp~	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp	2019-10-19 21:29:32.416045611 +0200
@@ -28,6 +28,8 @@ extern "C" {
 #include "../calendar/calendar_class.h"
 }
 
+using icu::GregorianCalendar;
+
 int datefmt_process_calendar_arg(zval* calendar_zv,
 								 Locale const& locale,
 								 const char *func_name,
Commit	Line	Data
87d63f96 AG	1	--- php-5.5.38.orig/ext/intl/breakiterator/breakiterator_class.cpp 2016-07-20 10:41:48.000000000 +0200
	2	+++ php-5.5.38/ext/intl/breakiterator/breakiterator_class.cpp 2019-04-18 09:26:37.409910360 +0200
	3	@@ -38,6 +38,7 @@
	4	}
	5
	6	using PHP::CodePointBreakIterator;
	7	+using icu::RuleBasedBreakIterator;
	8
	9	/* {{{ Global variables */
	10	zend_class_entry *BreakIterator_ce_ptr;
	11	--- php-5.5.38.orig/ext/intl/breakiterator/breakiterator_class.h 2016-07-20 10:41:48.000000000 +0200
	12	+++ php-5.5.38/ext/intl/breakiterator/breakiterator_class.h 2019-04-18 09:27:25.925787455 +0200
	13	@@ -26,6 +26,8 @@
	14
	15	#ifndef USE_BREAKITERATOR_POINTER
	16	typedef void BreakIterator;
	17	+#else
	18	+using icu::BreakIterator;
	19	#endif
	20
	21	typedef struct {
	22	--- php-5.5.38.orig/ext/intl/breakiterator/breakiterator_methods.cpp 2016-07-20 10:41:48.000000000 +0200
	23	+++ php-5.5.38/ext/intl/breakiterator/breakiterator_methods.cpp 2019-04-18 09:30:32.998928523 +0200
	24	@@ -32,6 +32,8 @@
	25	}
	26
	27	using PHP::CodePointBreakIterator;
	28	+using icu::BreakIterator;
	29	+using icu::Locale;
	30
	31	U_CFUNC PHP_METHOD(BreakIterator, __construct)
	32	{
	33	--- php-5.5.38.orig/ext/intl/breakiterator/codepointiterator_internal.cpp 2016-07-20 10:41:48.000000000 +0200
	34	+++ php-5.5.38/ext/intl/breakiterator/codepointiterator_internal.cpp 2019-04-18 09:24:40.240427586 +0200
	35	@@ -30,6 +30,7 @@
	36	#define U_ALIGNMENT_OFFSET_UP(ptr) (sizeof(UAlignedMemory) - U_ALIGNMENT_OFFSET(ptr))
	37
	38	using namespace PHP;
	39	+using icu::UCharCharacterIterator;
	40
	41	UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
	42
	43	--- php-5.5.38.orig/ext/intl/breakiterator/codepointiterator_internal.h 2016-07-20 10:41:48.000000000 +0200
	44	+++ php-5.5.38/ext/intl/breakiterator/codepointiterator_internal.h 2019-04-18 09:25:57.127796222 +0200
	45	@@ -18,8 +18,11 @@
	46	#define CODEPOINTITERATOR_INTERNAL_H
	47
	48	#include <unicode/brkiter.h>
	49	+#include <unicode/unistr.h>
	50
	51	-using U_ICU_NAMESPACE::BreakIterator;
	52	+using icu::BreakIterator;
	53	+using icu::CharacterIterator;
	54	+using icu::UnicodeString;
	55
	56	namespace PHP {
	57
	58	--- php-5.5.38.orig/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp 2016-07-20 10:41:48.000000000 +0200
	59	+++ php-5.5.38/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp 2019-04-18 09:30:55.920130219 +0200
	60	@@ -25,6 +25,9 @@
	61
	62	#include "../ext/intl_convertcpp.h"
	63
	64	+using icu::RuleBasedBreakIterator;
65	+using icu::Locale;
66	+
67	static inline RuleBasedBreakIterator fetch_rbbi(BreakIterator_object bio) {
68	return (RuleBasedBreakIterator*)bio->biter;
69	}
70	--- php-5.5.38.orig/ext/intl/calendar/calendar_class.cpp 2016-07-20 10:41:48.000000000 +0200
71	+++ php-5.5.38/ext/intl/calendar/calendar_class.cpp 2019-04-18 09:21:08.825998526 +0200
72	@@ -34,6 +34,9 @@
73	#include <assert.h>
74	}
75
76	+using icu::GregorianCalendar;
77	+using icu::Locale;
78	+
79	/* {{{ Global variables */
80	zend_class_entry *Calendar_ce_ptr;
81	zend_class_entry *GregorianCalendar_ce_ptr;
82	--- php-5.5.38.orig/ext/intl/calendar/calendar_class.h 2016-07-20 10:41:48.000000000 +0200
83	+++ php-5.5.38/ext/intl/calendar/calendar_class.h 2019-04-18 08:51:22.553104240 +0200
84	@@ -26,6 +26,8 @@
85
86	#ifndef USE_CALENDAR_POINTER
87	typedef void Calendar;
88	+#else
89	+using icu::Calendar;
90	#endif
91
92	typedef struct {
93	--- php-5.5.38.orig/ext/intl/calendar/calendar_methods.cpp 2016-07-20 10:41:48.000000000 +0200
94	+++ php-5.5.38/ext/intl/calendar/calendar_methods.cpp 2019-04-18 09:21:37.634177141 +0200
95	@@ -40,6 +40,8 @@
96	}
97	#include "../common/common_enum.h"
98
99	+using icu::Locale;
100	+
101	U_CFUNC PHP_METHOD(IntlCalendar, __construct)
102	{
103	zend_throw_exception( NULL,
104	--- php-5.5.38.orig/ext/intl/calendar/gregoriancalendar_methods.cpp 2016-07-20 10:41:48.000000000 +0200
105	+++ php-5.5.38/ext/intl/calendar/gregoriancalendar_methods.cpp 2019-04-18 09:23:00.341851246 +0200
106	@@ -32,6 +32,11 @@
107	#include <ext/date/php_date.h>
108	}
109
110	+using icu::GregorianCalendar;
111	+using icu::Locale;
112	+using icu::UnicodeString;
113	+using icu::StringPiece;
114	+
115	static inline GregorianCalendar fetch_greg(Calendar_object co) {
116	return (GregorianCalendar*)co->ucal;
117	}
118	--- php-5.5.38.orig/ext/intl/common/common_date.cpp 2016-07-20 10:41:48.000000000 +0200
119	+++ php-5.5.38/ext/intl/common/common_date.cpp 2019-04-18 08:53:40.357013115 +0200
120	@@ -17,6 +17,8 @@
121	#include "../ext/intl_cppshims.h"
122
123	#include <unicode/calendar.h>
124	+using icu::TimeZone;
125	+using icu::UnicodeString;
126
127	extern "C" {
128	#include "../php_intl.h"
129	--- php-5.5.38.orig/ext/intl/common/common_date.h 2016-07-20 10:41:48.000000000 +0200
130	+++ php-5.5.38/ext/intl/common/common_date.h 2019-04-18 09:04:53.802375635 +0200
131	@@ -27,6 +27,7 @@
132	#ifdef __cplusplus
133
134	#include <unicode/timezone.h>
135	+using icu::TimeZone;
136
137	U_CFUNC TimeZone timezone_convert_datetimezone(int type, void object, int is_datetime, intl_error outside_error, const char func TSRMLS_DC);
138	U_CFUNC int intl_datetime_decompose(zval z, double millis, TimeZone **tz,
139	--- php-5.5.38.orig/ext/intl/common/common_enum.h 2016-07-20 10:41:48.000000000 +0200
140	+++ php-5.5.38/ext/intl/common/common_enum.h 2019-04-18 08:50:49.214683321 +0200
141	@@ -69,6 +69,7 @@
142	U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter);
143
144	#ifdef __cplusplus
145	+using icu::StringEnumeration;
146	U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration se, zval object);
147	#endif
148
149	--- php-5.5.38.orig/ext/intl/dateformat/dateformat_format_object.cpp 2016-07-20 10:41:48.000000000 +0200
150	+++ php-5.5.38/ext/intl/dateformat/dateformat_format_object.cpp 2019-04-18 08:55:34.509673920 +0200
151	@@ -33,6 +33,12 @@
152	#include "../common/common_date.h"
153	}
154
155	+using icu::Locale;
156	+using icu::DateFormat;
157	+using icu::GregorianCalendar;
158	+using icu::StringPiece;
159	+using icu::SimpleDateFormat;
160	+
161	static const DateFormat::EStyle valid_styles[] = {
162	DateFormat::kNone,
163	DateFormat::kFull,
164	--- php-5.5.38.orig/ext/intl/dateformat/dateformat_helpers.h 2016-07-20 10:41:48.000000000 +0200
165	+++ php-5.5.38/ext/intl/dateformat/dateformat_helpers.h 2019-04-18 09:07:05.049267391 +0200
166	@@ -22,11 +22,18 @@
167	#endif
168
169	#include <unicode/calendar.h>
64d6d11b	170	+
87d63f96 AG	171	+#include <unicode/datefmt.h>
	172
	173	extern "C" {
	174	#include "../php_intl.h"
	175	}
	176
	177	+using icu::Locale;
	178	+using icu::Calendar;
64d6d11b	179	+
87d63f96 AG	180	+using icu::DateFormat;
	181	+
	182	int datefmt_process_calendar_arg(zval* calendar_zv,
	183	Locale const& locale,
	184	const char *func_name,
	185	--- php-5.5.38.orig/ext/intl/intl_convertcpp.h 2016-07-20 10:41:48.000000000 +0200
	186	+++ php-5.5.38/ext/intl/intl_convertcpp.h 2019-04-18 08:49:50.358252987 +0200
	187	@@ -24,6 +24,7 @@
	188
	189	#include <unicode/unistr.h>
	190	#include <zend_types.h>
	191	+using icu::UnicodeString;
	192
	193	int intl_stringFromChar(UnicodeString &ret, char str, int32_t str_len, UErrorCode status);
	194
	195	--- php-5.5.38.orig/ext/intl/msgformat/msgformat_helpers.cpp 2016-07-20 10:41:48.000000000 +0200
	196	+++ php-5.5.38/ext/intl/msgformat/msgformat_helpers.cpp 2019-04-18 09:00:43.482564710 +0200
	197	@@ -27,6 +27,7 @@
	198	#include <unicode/timezone.h>
	199	#include <unicode/datefmt.h>
	200	#include <unicode/calendar.h>
	201	+#include <unicode/strenum.h>
	202
	203	#include <vector>
	204
	205	@@ -76,6 +77,16 @@
	206	#endif
	207	U_NAMESPACE_END
	208
	209	+using icu::Formattable;
	210	+using icu::Format;
	211	+using icu::DateFormat;
	212	+using icu::MessageFormat;
	213	+#ifdef HAS_MESSAGE_PATTERN
	214	+using icu::MessagePattern;
	215	+#endif
	216	+using icu::MessageFormatAdapter;
	217	+using icu::FieldPosition;
	218	+
	219	U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
	220	{
	221	int32_t fmt_count = 0;
	222	--- php-5.5.38.orig/ext/intl/timezone/timezone_class.cpp 2016-07-20 10:41:48.000000000 +0200
	223	+++ php-5.5.38/ext/intl/timezone/timezone_class.cpp 2019-04-18 09:01:40.738904566 +0200
	224	@@ -37,6 +37,8 @@
	225	#include <ext/date/php_date.h>
	226	}
	227
	228	+using icu::Calendar;
	229	+
	230	/* {{{ Global variables */
	231	U_CDECL_BEGIN
	232	zend_class_entry *TimeZone_ce_ptr = NULL;
	233	--- php-5.5.38.orig/ext/intl/timezone/timezone_class.h 2016-07-20 10:41:48.000000000 +0200
	234	+++ php-5.5.38/ext/intl/timezone/timezone_class.h 2019-04-18 08:58:02.620784547 +0200
	235	@@ -29,6 +29,8 @@
	236
	237	#ifndef USE_TIMEZONE_POINTER
	238	typedef void TimeZone;
	239	+#else
	240	+using icu::TimeZone;
	241	#endif
	242
	243	typedef struct {
244	--- php-5.5.38.orig/ext/intl/timezone/timezone_methods.cpp 2016-07-20 10:41:48.000000000 +0200
245	+++ php-5.5.38/ext/intl/timezone/timezone_methods.cpp 2019-04-18 09:20:17.116617981 +0200
246	@@ -23,6 +23,7 @@
247	#include <unicode/locid.h>
248	#include <unicode/timezone.h>
249	#include <unicode/ustring.h>
250	+#include <unicode/calendar.h>
251	#include "intl_convertcpp.h"
252
253	#include "../common/common_date.h"
254	@@ -37,6 +38,9 @@
255	}
256	#include "common/common_enum.h"
257
258	+using icu::Locale;
259	+using icu::Calendar;
260	+
261	U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
262	{
263	zend_throw_exception( NULL,
64d6d11b AM	264
	265	--- php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp~ 2018-12-04 18:22:53.000000000 +0100
	266	+++ php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp 2019-10-19 21:29:32.416045611 +0200
	267	@@ -28,6 +28,8 @@ extern "C" {
	268	#include "../calendar/calendar_class.h"
	269	}
	270
	271	+using icu::GregorianCalendar;
	272	+
	273	int datefmt_process_calendar_arg(zval* calendar_zv,
	274	Locale const& locale,
	275	const char *func_name,