summaryrefslogtreecommitdiff
path: root/ext/intl/calendar/gregoriancalendar_methods.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ext/intl/calendar/gregoriancalendar_methods.cpp')
-rw-r--r--ext/intl/calendar/gregoriancalendar_methods.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp
index 004d8e0c4f..ca8c1ced95 100644
--- a/ext/intl/calendar/gregoriancalendar_methods.cpp
+++ b/ext/intl/calendar/gregoriancalendar_methods.cpp
@@ -185,12 +185,7 @@ static void _php_intlgregcal_constructor_body(
}
timelib_tzinfo *tzinfo = get_timezone_info();
-#if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM >= 42
UnicodeString tzstr = UnicodeString::fromUTF8(StringPiece(tzinfo->name));
-#else
- UnicodeString tzstr = UnicodeString(tzinfo->name,
- strlen(tzinfo->name), US_INV);
-#endif
if (tzstr.isBogus()) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"intlgregcal_create_instance: could not create UTF-8 string "