diff options
Diffstat (limited to 'ext/intl/uchar')
-rw-r--r-- | ext/intl/uchar/ublockcode-enum.h | 6 | ||||
-rw-r--r-- | ext/intl/uchar/uchar.c | 2 | ||||
-rw-r--r-- | ext/intl/uchar/uother-enum.h | 18 | ||||
-rw-r--r-- | ext/intl/uchar/uproperty-enum.h | 4 |
4 files changed, 0 insertions, 30 deletions
diff --git a/ext/intl/uchar/ublockcode-enum.h b/ext/intl/uchar/ublockcode-enum.h index aaed7f12ed..489a2da89a 100644 --- a/ext/intl/uchar/ublockcode-enum.h +++ b/ext/intl/uchar/ublockcode-enum.h @@ -173,7 +173,6 @@ UBLOCKCODE(CARIAN) UBLOCKCODE(LYDIAN) UBLOCKCODE(MAHJONG_TILES) UBLOCKCODE(DOMINO_TILES) -#if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM >= 44 UBLOCKCODE(SAMARITAN) UBLOCKCODE(UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED) UBLOCKCODE(TAI_THAM) @@ -200,8 +199,6 @@ UBLOCKCODE(EGYPTIAN_HIEROGLYPHS) UBLOCKCODE(ENCLOSED_ALPHANUMERIC_SUPPLEMENT) UBLOCKCODE(ENCLOSED_IDEOGRAPHIC_SUPPLEMENT) UBLOCKCODE(CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C) -#endif /* ICU >= 4.4 */ -#if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM >= 46 UBLOCKCODE(MANDAIC) UBLOCKCODE(BATAK) UBLOCKCODE(ETHIOPIC_EXTENDED_A) @@ -214,8 +211,6 @@ UBLOCKCODE(EMOTICONS) UBLOCKCODE(TRANSPORT_AND_MAP_SYMBOLS) UBLOCKCODE(ALCHEMICAL_SYMBOLS) UBLOCKCODE(CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D) -#endif /* ICU >= 49.0 */ -#if U_ICU_VERSION_MAJOR_NUM >= 49 UBLOCKCODE(ARABIC_EXTENDED_A) UBLOCKCODE(ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS) UBLOCKCODE(CHAKMA) @@ -227,7 +222,6 @@ UBLOCKCODE(SHARADA) UBLOCKCODE(SORA_SOMPENG) UBLOCKCODE(SUNDANESE_SUPPLEMENT) UBLOCKCODE(TAKRI) -#endif /* ICU >= 49 */ #if U_ICU_VERSION_MAJOR_NUM >= 54 UBLOCKCODE(BASSA_VAH) UBLOCKCODE(CAUCASIAN_ALBANIAN) diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c index c4a1c76278..857b4d5d93 100644 --- a/ext/intl/uchar/uchar.c +++ b/ext/intl/uchar/uchar.c @@ -3,9 +3,7 @@ #include "intl_convert.h" #include <unicode/uchar.h> -#if U_ICU_VERSION_MAJOR_NUM >= 49 #include <unicode/utf8.h> -#endif #define IC_METHOD(mname) PHP_METHOD(IntlChar, mname) diff --git a/ext/intl/uchar/uother-enum.h b/ext/intl/uchar/uother-enum.h index 5e59b6bd36..c45dfad6c7 100644 --- a/ext/intl/uchar/uother-enum.h +++ b/ext/intl/uchar/uother-enum.h @@ -19,9 +19,7 @@ UOTHER(EA_COUNT) UOTHER(UNICODE_CHAR_NAME) UOTHER(UNICODE_10_CHAR_NAME) UOTHER(EXTENDED_CHAR_NAME) -#if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM >= 44 UOTHER(CHAR_NAME_ALIAS) -#endif /* ICU >= 4.4 */ UOTHER(CHAR_NAME_CHOICE_COUNT) /* UPropertyNameChoice - http://icu-project.org/apiref/icu4c/uchar_8h.html#a5056494c7d5a2c7185f3c464f48fe5d1 */ @@ -74,9 +72,7 @@ UOTHER(JG_FINAL_SEMKATH) UOTHER(JG_GAF) UOTHER(JG_GAMAL) UOTHER(JG_HAH) -#if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM >= 46 UOTHER(JG_TEH_MARBUTA_GOAL) -#endif /* ICU >= 4.6 */ UOTHER(JG_HAMZA_ON_HEH_GOAL) UOTHER(JG_HE) UOTHER(JG_HEH) @@ -118,13 +114,9 @@ UOTHER(JG_FE) UOTHER(JG_KHAPH) UOTHER(JG_ZHAIN) UOTHER(JG_BURUSHASKI_YEH_BARREE) -#if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM >= 44 UOTHER(JG_FARSI_YEH) UOTHER(JG_NYA) -#endif /* ICU >= 4.4 */ -#if U_ICU_VERSION_MAJOR_NUM >= 49 UOTHER(JG_ROHINGYA_YEH) -#endif #if U_ICU_VERSION_MAJOR_NUM >= 54 UOTHER(JG_MANICHAEAN_ALEPH) UOTHER(JG_MANICHAEAN_AYIN) @@ -170,9 +162,7 @@ UOTHER(GCB_T) UOTHER(GCB_V) UOTHER(GCB_SPACING_MARK) UOTHER(GCB_PREPEND) -#if U_ICU_VERSION_MAJOR_NUM >= 50 UOTHER(GCB_REGIONAL_INDICATOR) -#endif /* ICU 50 */ UOTHER(GCB_COUNT) /* UWordBreakValues - http://icu-project.org/apiref/icu4c/uchar_8h.html#af70ee907368e663f8dd4b90c7196e15c */ @@ -189,9 +179,7 @@ UOTHER(WB_EXTEND) UOTHER(WB_LF) UOTHER(WB_MIDNUMLET) UOTHER(WB_NEWLINE) -#if U_ICU_VERSION_MAJOR_NUM >= 50 UOTHER(WB_REGIONAL_INDICATOR) -#endif /* ICU >= 50 */ #if U_ICU_VERSION_MAJOR_NUM >= 52 UOTHER(WB_HEBREW_LETTER) UOTHER(WB_SINGLE_QUOTE) @@ -255,16 +243,10 @@ UOTHER(LB_H3) UOTHER(LB_JL) UOTHER(LB_JT) UOTHER(LB_JV) -#if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM >= 44 UOTHER(LB_CLOSE_PARENTHESIS) -#endif /* ICU >= 4.4 */ -#if U_ICU_VERSION_MAJOR_NUM >= 49 UOTHER(LB_CONDITIONAL_JAPANESE_STARTER) UOTHER(LB_HEBREW_LETTER) -#endif /* ICU >= 49 */ -#if U_ICU_VERSION_MAJOR_NUM >= 50 UOTHER(LB_REGIONAL_INDICATOR) -#endif /* ICU >= 50 */ UOTHER(LB_COUNT) /* UNumericType - http://icu-project.org/apiref/icu4c/uchar_8h.html#adec3e7a6ae3a00274c019b3b2ddaecbe */ diff --git a/ext/intl/uchar/uproperty-enum.h b/ext/intl/uchar/uproperty-enum.h index 3b7b80f365..59095a493e 100644 --- a/ext/intl/uchar/uproperty-enum.h +++ b/ext/intl/uchar/uproperty-enum.h @@ -49,7 +49,6 @@ UPROPERTY(POSIX_BLANK) UPROPERTY(POSIX_GRAPH) UPROPERTY(POSIX_PRINT) UPROPERTY(POSIX_XDIGIT) -#if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM >= 44 UPROPERTY(CASED) UPROPERTY(CASE_IGNORABLE) UPROPERTY(CHANGES_WHEN_LOWERCASED) @@ -58,7 +57,6 @@ UPROPERTY(CHANGES_WHEN_TITLECASED) UPROPERTY(CHANGES_WHEN_CASEFOLDED) UPROPERTY(CHANGES_WHEN_CASEMAPPED) UPROPERTY(CHANGES_WHEN_NFKC_CASEFOLDED) -#endif /* ICU >= 4.4 */ UPROPERTY(BINARY_LIMIT) UPROPERTY(BIDI_CLASS) UPROPERTY(INT_START) @@ -110,9 +108,7 @@ UPROPERTY(UPPERCASE_MAPPING) UPROPERTY(BIDI_PAIRED_BRACKET) #endif /* ICU >= 52 */ UPROPERTY(STRING_LIMIT) -#if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM >= 46 UPROPERTY(SCRIPT_EXTENSIONS) UPROPERTY(OTHER_PROPERTY_START) UPROPERTY(OTHER_PROPERTY_LIMIT) -#endif /* ICU >= 4.6 */ UPROPERTY(INVALID_CODE) |