From 1cca956fcf7a05edb26e6c351d8d61ba59d88ee5 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Wed, 21 Sep 2016 06:07:26 +0000 Subject: [PATCH] ICU-12738 ICU4C BRS, update urename.h X-SVN-Rev: 39307 --- icu4c/source/common/unicode/urename.h | 11 +++++++++++ icu4c/source/tools/genren/Makefile | 6 +----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/icu4c/source/common/unicode/urename.h b/icu4c/source/common/unicode/urename.h index 5294ff545e..b220a54697 100644 --- a/icu4c/source/common/unicode/urename.h +++ b/icu4c/source/common/unicode/urename.h @@ -476,6 +476,9 @@ #define ubidi_setReorderingOptions U_ICU_ENTRY_POINT_RENAME(ubidi_setReorderingOptions) #define ubidi_writeReordered U_ICU_ENTRY_POINT_RENAME(ubidi_writeReordered) #define ubidi_writeReverse U_ICU_ENTRY_POINT_RENAME(ubidi_writeReverse) +#define ubiditransform_close U_ICU_ENTRY_POINT_RENAME(ubiditransform_close) +#define ubiditransform_open U_ICU_ENTRY_POINT_RENAME(ubiditransform_open) +#define ubiditransform_transform U_ICU_ENTRY_POINT_RENAME(ubiditransform_transform) #define ublock_getCode U_ICU_ENTRY_POINT_RENAME(ublock_getCode) #define ubrk_close U_ICU_ENTRY_POINT_RENAME(ubrk_close) #define ubrk_countAvailable U_ICU_ENTRY_POINT_RENAME(ubrk_countAvailable) @@ -1608,13 +1611,20 @@ #define uspoof_areConfusableUTF8 U_ICU_ENTRY_POINT_RENAME(uspoof_areConfusableUTF8) #define uspoof_areConfusableUnicodeString U_ICU_ENTRY_POINT_RENAME(uspoof_areConfusableUnicodeString) #define uspoof_check U_ICU_ENTRY_POINT_RENAME(uspoof_check) +#define uspoof_check2 U_ICU_ENTRY_POINT_RENAME(uspoof_check2) +#define uspoof_check2UTF8 U_ICU_ENTRY_POINT_RENAME(uspoof_check2UTF8) +#define uspoof_check2UnicodeString U_ICU_ENTRY_POINT_RENAME(uspoof_check2UnicodeString) #define uspoof_checkUTF8 U_ICU_ENTRY_POINT_RENAME(uspoof_checkUTF8) #define uspoof_checkUnicodeString U_ICU_ENTRY_POINT_RENAME(uspoof_checkUnicodeString) #define uspoof_clone U_ICU_ENTRY_POINT_RENAME(uspoof_clone) #define uspoof_close U_ICU_ENTRY_POINT_RENAME(uspoof_close) +#define uspoof_closeCheckResult U_ICU_ENTRY_POINT_RENAME(uspoof_closeCheckResult) #define uspoof_getAllowedChars U_ICU_ENTRY_POINT_RENAME(uspoof_getAllowedChars) #define uspoof_getAllowedLocales U_ICU_ENTRY_POINT_RENAME(uspoof_getAllowedLocales) #define uspoof_getAllowedUnicodeSet U_ICU_ENTRY_POINT_RENAME(uspoof_getAllowedUnicodeSet) +#define uspoof_getCheckResultChecks U_ICU_ENTRY_POINT_RENAME(uspoof_getCheckResultChecks) +#define uspoof_getCheckResultNumerics U_ICU_ENTRY_POINT_RENAME(uspoof_getCheckResultNumerics) +#define uspoof_getCheckResultRestrictionLevel U_ICU_ENTRY_POINT_RENAME(uspoof_getCheckResultRestrictionLevel) #define uspoof_getChecks U_ICU_ENTRY_POINT_RENAME(uspoof_getChecks) #define uspoof_getInclusionSet U_ICU_ENTRY_POINT_RENAME(uspoof_getInclusionSet) #define uspoof_getInclusionUnicodeSet U_ICU_ENTRY_POINT_RENAME(uspoof_getInclusionUnicodeSet) @@ -1626,6 +1636,7 @@ #define uspoof_getSkeletonUnicodeString U_ICU_ENTRY_POINT_RENAME(uspoof_getSkeletonUnicodeString) #define uspoof_internalInitStatics U_ICU_ENTRY_POINT_RENAME(uspoof_internalInitStatics) #define uspoof_open U_ICU_ENTRY_POINT_RENAME(uspoof_open) +#define uspoof_openCheckResult U_ICU_ENTRY_POINT_RENAME(uspoof_openCheckResult) #define uspoof_openFromSerialized U_ICU_ENTRY_POINT_RENAME(uspoof_openFromSerialized) #define uspoof_openFromSource U_ICU_ENTRY_POINT_RENAME(uspoof_openFromSource) #define uspoof_serialize U_ICU_ENTRY_POINT_RENAME(uspoof_serialize) diff --git a/icu4c/source/tools/genren/Makefile b/icu4c/source/tools/genren/Makefile index 17b32f128c..4c15e813ce 100644 --- a/icu4c/source/tools/genren/Makefile +++ b/icu4c/source/tools/genren/Makefile @@ -34,12 +34,11 @@ endif COM=$(ICUDIR)/lib/libicuuc.$(SO) I18=$(ICUDIR)/lib/libicui18n.$(SO) -LAY=$(ICUDIR)/lib/libicule.$(SO) LEX=$(ICUDIR)/lib/libiculx.$(SO) DAT=$(ICUDIR)/stubdata/libicudata.$(SO) UIO=$(ICUDIR)/lib/libicuio.$(SO) -LIBS=$(COM) $(I18) $(LAY) $(LEX) $(UIO) +LIBS=$(COM) $(I18) $(LEX) $(UIO) ## Targets. @@ -71,9 +70,6 @@ $(COM): $(DAT) $(ICUDIR)/config.status Makefile $(I18): $(DAT) $(COM) $(ICUDIR)/config.status Makefile $(MAKE) $(FLAG_OVERRIDE) -C $(ICUDIR)/i18n all-local -$(LAY): $(DAT) $(I18) $(COM) $(ICUDIR)/config.status Makefile - $(MAKE) $(FLAG_OVERRIDE) -C $(ICUDIR)/layout all-local - $(LEX): $(DAT) $(I18) $(COM) $(ICUDIR)/config.status Makefile $(MAKE) $(FLAG_OVERRIDE) -C $(ICUDIR)/layoutex all-local