ICU-8547 update udraft.h etc

X-SVN-Rev: 30078

diff --git a/icu4c/source/common/unicode/udeprctd.h b/icu4c/source/common/unicode/udeprctd.h
index 76a15e88b10eda6ebb9270766e08cb161ac25c05..00fa027e02937f226d855a44783c34b5ec41e587 100644 (file)
--- a/icu4c/source/common/unicode/udeprctd.h
+++ b/icu4c/source/common/unicode/udeprctd.h
@@ -24,23 +24,23 @@
 #ifdef U_HIDE_DEPRECATED_API
 
 #    if U_DISABLE_RENAMING
-#        define ucol_getContractions(const UCollator *coll, USet *conts, UErrorCode *status) ucol_getContractions(const UCollator *coll, USet *conts, UErrorCode *status)_DEPRECATED_API_DO_NOT_USE
-#        define ucol_getLocale(const UCollator *coll, ULocDataLocaleType type, UErrorCode *status) ucol_getLocale(const UCollator *coll, ULocDataLocaleType type, UErrorCode *status)_DEPRECATED_API_DO_NOT_USE
-#        define ures_countArrayItems(const UResourceBundle *resourceBundle, const char *resourceKey, UErrorCode *err) ures_countArrayItems(const UResourceBundle *resourceBundle, const char *resourceKey, UErrorCode *err)_DEPRECATED_API_DO_NOT_USE
-#        define ures_getLocale(const UResourceBundle *resourceBundle, UErrorCode *status) ures_getLocale(const UResourceBundle *resourceBundle, UErrorCode *status)_DEPRECATED_API_DO_NOT_USE
-#        define ures_getVersionNumber(const UResourceBundle *resourceBundle) ures_getVersionNumber(const UResourceBundle *resourceBundle)_DEPRECATED_API_DO_NOT_USE
-#        define utrans_getAvailableID(int32_t index, char *buf, int32_t bufCapacity) utrans_getAvailableID(int32_t index, char *buf, int32_t bufCapacity)_DEPRECATED_API_DO_NOT_USE
-#        define utrans_getID(const UTransliterator *trans, char *buf, int32_t bufCapacity) utrans_getID(const UTransliterator *trans, char *buf, int32_t bufCapacity)_DEPRECATED_API_DO_NOT_USE
-#        define utrans_unregister(const char *id) utrans_unregister(const char *id)_DEPRECATED_API_DO_NOT_USE
+#        define ucol_getContractions ucol_getContractions_DEPRECATED_API_DO_NOT_USE
+#        define ucol_getLocale ucol_getLocale_DEPRECATED_API_DO_NOT_USE
+#        define ures_countArrayItems ures_countArrayItems_DEPRECATED_API_DO_NOT_USE
+#        define ures_getLocale ures_getLocale_DEPRECATED_API_DO_NOT_USE
+#        define ures_getVersionNumber ures_getVersionNumber_DEPRECATED_API_DO_NOT_USE
+#        define utrans_getAvailableID utrans_getAvailableID_DEPRECATED_API_DO_NOT_USE
+#        define utrans_getID utrans_getID_DEPRECATED_API_DO_NOT_USE
+#        define utrans_unregister utrans_unregister_DEPRECATED_API_DO_NOT_USE
 #    else
-#        define ucol_getContractions(const UCollator *coll, USet *conts, UErrorCode *status)_4_7 ucol_getContractions(const UCollator *coll, USet *conts, UErrorCode *status)_DEPRECATED_API_DO_NOT_USE
-#        define ucol_getLocale(const UCollator *coll, ULocDataLocaleType type, UErrorCode *status)_4_7 ucol_getLocale(const UCollator *coll, ULocDataLocaleType type, UErrorCode *status)_DEPRECATED_API_DO_NOT_USE
-#        define ures_countArrayItems(const UResourceBundle *resourceBundle, const char *resourceKey, UErrorCode *err)_4_7 ures_countArrayItems(const UResourceBundle *resourceBundle, const char *resourceKey, UErrorCode *err)_DEPRECATED_API_DO_NOT_USE
-#        define ures_getLocale(const UResourceBundle *resourceBundle, UErrorCode *status)_4_7 ures_getLocale(const UResourceBundle *resourceBundle, UErrorCode *status)_DEPRECATED_API_DO_NOT_USE
-#        define ures_getVersionNumber(const UResourceBundle *resourceBundle)_4_7 ures_getVersionNumber(const UResourceBundle *resourceBundle)_DEPRECATED_API_DO_NOT_USE
-#        define utrans_getAvailableID(int32_t index, char *buf, int32_t bufCapacity)_4_7 utrans_getAvailableID(int32_t index, char *buf, int32_t bufCapacity)_DEPRECATED_API_DO_NOT_USE
-#        define utrans_getID(const UTransliterator *trans, char *buf, int32_t bufCapacity)_4_7 utrans_getID(const UTransliterator *trans, char *buf, int32_t bufCapacity)_DEPRECATED_API_DO_NOT_USE
-#        define utrans_unregister(const char *id)_4_7 utrans_unregister(const char *id)_DEPRECATED_API_DO_NOT_USE
+#        define ucol_getContractions_48 ucol_getContractions_DEPRECATED_API_DO_NOT_USE
+#        define ucol_getLocale_48 ucol_getLocale_DEPRECATED_API_DO_NOT_USE
+#        define ures_countArrayItems_48 ures_countArrayItems_DEPRECATED_API_DO_NOT_USE
+#        define ures_getLocale_48 ures_getLocale_DEPRECATED_API_DO_NOT_USE
+#        define ures_getVersionNumber_48 ures_getVersionNumber_DEPRECATED_API_DO_NOT_USE
+#        define utrans_getAvailableID_48 utrans_getAvailableID_DEPRECATED_API_DO_NOT_USE
+#        define utrans_getID_48 utrans_getID_DEPRECATED_API_DO_NOT_USE
+#        define utrans_unregister_48 utrans_unregister_DEPRECATED_API_DO_NOT_USE
 #    endif /* U_DISABLE_RENAMING */
 
 #endif /* U_HIDE_DEPRECATED_API */

diff --git a/icu4c/source/common/unicode/udraft.h b/icu4c/source/common/unicode/udraft.h
index b646bd8f1c78d838452d5eae115921aa1e7cd787..4755d65d0c7b674d2b79d7edc34dc83bdf1bbd56 100644 (file)
--- a/icu4c/source/common/unicode/udraft.h
+++ b/icu4c/source/common/unicode/udraft.h
@@ -24,55 +24,67 @@
 #ifdef U_HIDE_DRAFT_API
 
 #    if U_DISABLE_RENAMING
-#        define StringPiece&y) StringPiece&y)_DRAFT_API_DO_NOT_USE
-#        define ubidi_getBaseDirection(const UChar *text, int32_t length) ubidi_getBaseDirection(const UChar *text, int32_t length)_DRAFT_API_DO_NOT_USE
-#        define ucal_openTimeZoneIDEnumeration(USystemTimeZoneType zoneType, const char *region, const int32_t *rawOffset, UErrorCode *ec) ucal_openTimeZoneIDEnumeration(USystemTimeZoneType zoneType, const char *region, const int32_t *rawOffset, UErrorCode *ec)_DRAFT_API_DO_NOT_USE
-#        define ucnv_isFixedWidth(UConverter *cnv, UErrorCode *status) ucnv_isFixedWidth(UConverter *cnv, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uidna_close(UIDNA *idna) uidna_close(UIDNA *idna)_DRAFT_API_DO_NOT_USE
-#        define uidna_openUTS46(uint32_t options, UErrorCode *pErrorCode) uidna_openUTS46(uint32_t options, UErrorCode *pErrorCode)_DRAFT_API_DO_NOT_USE
-#        define uloc_forLanguageTag(const char *langtag, char *localeID, int32_t localeIDCapacity, int32_t *parsedLength, UErrorCode *err) uloc_forLanguageTag(const char *langtag, char *localeID, int32_t localeIDCapacity, int32_t *parsedLength, UErrorCode *err)_DRAFT_API_DO_NOT_USE
-#        define uloc_toLanguageTag(const char *localeID, char *langtag, int32_t langtagCapacity, UBool strict, UErrorCode *err) uloc_toLanguageTag(const char *localeID, char *langtag, int32_t langtagCapacity, UBool strict, UErrorCode *err)_DRAFT_API_DO_NOT_USE
-#        define unorm2_getDecomposition(const UNormalizer2 *norm2, UChar32 c, UChar *decomposition, int32_t capacity, UErrorCode *pErrorCode) unorm2_getDecomposition(const UNormalizer2 *norm2, UChar32 c, UChar *decomposition, int32_t capacity, UErrorCode *pErrorCode)_DRAFT_API_DO_NOT_USE
-#        define uregex_end64(URegularExpression *regexp, int32_t groupNum, UErrorCode *status) uregex_end64(URegularExpression *regexp, int32_t groupNum, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_find64(URegularExpression *regexp, int64_t startIndex, UErrorCode *status) uregex_find64(URegularExpression *regexp, int64_t startIndex, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_getFindProgressCallback(const URegularExpression *regexp, URegexFindProgressCallback **callback, const void **context, UErrorCode *status) uregex_getFindProgressCallback(const URegularExpression *regexp, URegexFindProgressCallback **callback, const void **context, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_lookingAt64(URegularExpression *regexp, int64_t startIndex, UErrorCode *status) uregex_lookingAt64(URegularExpression *regexp, int64_t startIndex, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_matches64(URegularExpression *regexp, int64_t startIndex, UErrorCode *status) uregex_matches64(URegularExpression *regexp, int64_t startIndex, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_patternUText(const URegularExpression *regexp, UErrorCode *status) uregex_patternUText(const URegularExpression *regexp, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_regionEnd64(const URegularExpression *regexp, UErrorCode *status) uregex_regionEnd64(const URegularExpression *regexp, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_regionStart64(const URegularExpression *regexp, UErrorCode *status) uregex_regionStart64(const URegularExpression *regexp, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_reset64(URegularExpression *regexp, int64_t index, UErrorCode *status) uregex_reset64(URegularExpression *regexp, int64_t index, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_setFindProgressCallback(URegularExpression *regexp, URegexFindProgressCallback *callback, const void *context, UErrorCode *status) uregex_setFindProgressCallback(URegularExpression *regexp, URegexFindProgressCallback *callback, const void *context, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_setRegion64(URegularExpression *regexp, int64_t regionStart, int64_t regionLimit, UErrorCode *status) uregex_setRegion64(URegularExpression *regexp, int64_t regionStart, int64_t regionLimit, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_setRegionAndStart(URegularExpression *regexp, int64_t regionStart, int64_t regionLimit, int64_t startIndex, UErrorCode *status) uregex_setRegionAndStart(URegularExpression *regexp, int64_t regionStart, int64_t regionLimit, int64_t startIndex, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_start64(URegularExpression *regexp, int32_t groupNum, UErrorCode *status) uregex_start64(URegularExpression *regexp, int32_t groupNum, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uscript_getScriptExtensions(UChar32 c, UScriptCode *scripts, int32_t capacity, UErrorCode *pErrorCode) uscript_getScriptExtensions(UChar32 c, UScriptCode *scripts, int32_t capacity, UErrorCode *pErrorCode)_DRAFT_API_DO_NOT_USE
-#        define uscript_hasScript(UChar32 c, UScriptCode sc) uscript_hasScript(UChar32 c, UScriptCode sc)_DRAFT_API_DO_NOT_USE
+#        define StringPiece StringPiece_DRAFT_API_DO_NOT_USE
+#        define ubidi_getBaseDirection ubidi_getBaseDirection_DRAFT_API_DO_NOT_USE
+#        define ubidi_setContext ubidi_setContext_DRAFT_API_DO_NOT_USE
+#        define ucal_getFieldDifference ucal_getFieldDifference_DRAFT_API_DO_NOT_USE
+#        define ucal_openTimeZoneIDEnumeration ucal_openTimeZoneIDEnumeration_DRAFT_API_DO_NOT_USE
+#        define ucnv_isFixedWidth ucnv_isFixedWidth_DRAFT_API_DO_NOT_USE
+#        define ucol_getEquivalentReorderCodes ucol_getEquivalentReorderCodes_DRAFT_API_DO_NOT_USE
+#        define ucol_getReorderCodes ucol_getReorderCodes_DRAFT_API_DO_NOT_USE
+#        define ucol_setReorderCodes ucol_setReorderCodes_DRAFT_API_DO_NOT_USE
+#        define ucurr_isAvailable ucurr_isAvailable_DRAFT_API_DO_NOT_USE
+#        define uidna_close uidna_close_DRAFT_API_DO_NOT_USE
+#        define uidna_openUTS46 uidna_openUTS46_DRAFT_API_DO_NOT_USE
+#        define uloc_forLanguageTag uloc_forLanguageTag_DRAFT_API_DO_NOT_USE
+#        define uloc_toLanguageTag uloc_toLanguageTag_DRAFT_API_DO_NOT_USE
+#        define unorm2_getDecomposition unorm2_getDecomposition_DRAFT_API_DO_NOT_USE
+#        define uregex_end64 uregex_end64_DRAFT_API_DO_NOT_USE
+#        define uregex_find64 uregex_find64_DRAFT_API_DO_NOT_USE
+#        define uregex_getFindProgressCallback uregex_getFindProgressCallback_DRAFT_API_DO_NOT_USE
+#        define uregex_lookingAt64 uregex_lookingAt64_DRAFT_API_DO_NOT_USE
+#        define uregex_matches64 uregex_matches64_DRAFT_API_DO_NOT_USE
+#        define uregex_patternUText uregex_patternUText_DRAFT_API_DO_NOT_USE
+#        define uregex_regionEnd64 uregex_regionEnd64_DRAFT_API_DO_NOT_USE
+#        define uregex_regionStart64 uregex_regionStart64_DRAFT_API_DO_NOT_USE
+#        define uregex_reset64 uregex_reset64_DRAFT_API_DO_NOT_USE
+#        define uregex_setFindProgressCallback uregex_setFindProgressCallback_DRAFT_API_DO_NOT_USE
+#        define uregex_setRegion64 uregex_setRegion64_DRAFT_API_DO_NOT_USE
+#        define uregex_setRegionAndStart uregex_setRegionAndStart_DRAFT_API_DO_NOT_USE
+#        define uregex_start64 uregex_start64_DRAFT_API_DO_NOT_USE
+#        define uscript_getScriptExtensions uscript_getScriptExtensions_DRAFT_API_DO_NOT_USE
+#        define uscript_hasScript uscript_hasScript_DRAFT_API_DO_NOT_USE
 #    else
-#        define StringPiece&y)_4_7 StringPiece&y)_DRAFT_API_DO_NOT_USE
-#        define ubidi_getBaseDirection(const UChar *text, int32_t length)_4_7 ubidi_getBaseDirection(const UChar *text, int32_t length)_DRAFT_API_DO_NOT_USE
-#        define ucal_openTimeZoneIDEnumeration(USystemTimeZoneType zoneType, const char *region, const int32_t *rawOffset, UErrorCode *ec)_4_7 ucal_openTimeZoneIDEnumeration(USystemTimeZoneType zoneType, const char *region, const int32_t *rawOffset, UErrorCode *ec)_DRAFT_API_DO_NOT_USE
-#        define ucnv_isFixedWidth(UConverter *cnv, UErrorCode *status)_4_7 ucnv_isFixedWidth(UConverter *cnv, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uidna_close(UIDNA *idna)_4_7 uidna_close(UIDNA *idna)_DRAFT_API_DO_NOT_USE
-#        define uidna_openUTS46(uint32_t options, UErrorCode *pErrorCode)_4_7 uidna_openUTS46(uint32_t options, UErrorCode *pErrorCode)_DRAFT_API_DO_NOT_USE
-#        define uloc_forLanguageTag(const char *langtag, char *localeID, int32_t localeIDCapacity, int32_t *parsedLength, UErrorCode *err)_4_7 uloc_forLanguageTag(const char *langtag, char *localeID, int32_t localeIDCapacity, int32_t *parsedLength, UErrorCode *err)_DRAFT_API_DO_NOT_USE
-#        define uloc_toLanguageTag(const char *localeID, char *langtag, int32_t langtagCapacity, UBool strict, UErrorCode *err)_4_7 uloc_toLanguageTag(const char *localeID, char *langtag, int32_t langtagCapacity, UBool strict, UErrorCode *err)_DRAFT_API_DO_NOT_USE
-#        define unorm2_getDecomposition(const UNormalizer2 *norm2, UChar32 c, UChar *decomposition, int32_t capacity, UErrorCode *pErrorCode)_4_7 unorm2_getDecomposition(const UNormalizer2 *norm2, UChar32 c, UChar *decomposition, int32_t capacity, UErrorCode *pErrorCode)_DRAFT_API_DO_NOT_USE
-#        define uregex_end64(URegularExpression *regexp, int32_t groupNum, UErrorCode *status)_4_7 uregex_end64(URegularExpression *regexp, int32_t groupNum, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_find64(URegularExpression *regexp, int64_t startIndex, UErrorCode *status)_4_7 uregex_find64(URegularExpression *regexp, int64_t startIndex, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_getFindProgressCallback(const URegularExpression *regexp, URegexFindProgressCallback **callback, const void **context, UErrorCode *status)_4_7 uregex_getFindProgressCallback(const URegularExpression *regexp, URegexFindProgressCallback **callback, const void **context, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_lookingAt64(URegularExpression *regexp, int64_t startIndex, UErrorCode *status)_4_7 uregex_lookingAt64(URegularExpression *regexp, int64_t startIndex, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_matches64(URegularExpression *regexp, int64_t startIndex, UErrorCode *status)_4_7 uregex_matches64(URegularExpression *regexp, int64_t startIndex, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_patternUText(const URegularExpression *regexp, UErrorCode *status)_4_7 uregex_patternUText(const URegularExpression *regexp, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_regionEnd64(const URegularExpression *regexp, UErrorCode *status)_4_7 uregex_regionEnd64(const URegularExpression *regexp, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_regionStart64(const URegularExpression *regexp, UErrorCode *status)_4_7 uregex_regionStart64(const URegularExpression *regexp, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_reset64(URegularExpression *regexp, int64_t index, UErrorCode *status)_4_7 uregex_reset64(URegularExpression *regexp, int64_t index, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_setFindProgressCallback(URegularExpression *regexp, URegexFindProgressCallback *callback, const void *context, UErrorCode *status)_4_7 uregex_setFindProgressCallback(URegularExpression *regexp, URegexFindProgressCallback *callback, const void *context, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_setRegion64(URegularExpression *regexp, int64_t regionStart, int64_t regionLimit, UErrorCode *status)_4_7 uregex_setRegion64(URegularExpression *regexp, int64_t regionStart, int64_t regionLimit, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_setRegionAndStart(URegularExpression *regexp, int64_t regionStart, int64_t regionLimit, int64_t startIndex, UErrorCode *status)_4_7 uregex_setRegionAndStart(URegularExpression *regexp, int64_t regionStart, int64_t regionLimit, int64_t startIndex, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uregex_start64(URegularExpression *regexp, int32_t groupNum, UErrorCode *status)_4_7 uregex_start64(URegularExpression *regexp, int32_t groupNum, UErrorCode *status)_DRAFT_API_DO_NOT_USE
-#        define uscript_getScriptExtensions(UChar32 c, UScriptCode *scripts, int32_t capacity, UErrorCode *pErrorCode)_4_7 uscript_getScriptExtensions(UChar32 c, UScriptCode *scripts, int32_t capacity, UErrorCode *pErrorCode)_DRAFT_API_DO_NOT_USE
-#        define uscript_hasScript(UChar32 c, UScriptCode sc)_4_7 uscript_hasScript(UChar32 c, UScriptCode sc)_DRAFT_API_DO_NOT_USE
+#        define StringPiece_48 StringPiece_DRAFT_API_DO_NOT_USE
+#        define ubidi_getBaseDirection_48 ubidi_getBaseDirection_DRAFT_API_DO_NOT_USE
+#        define ubidi_setContext_48 ubidi_setContext_DRAFT_API_DO_NOT_USE
+#        define ucal_getFieldDifference_48 ucal_getFieldDifference_DRAFT_API_DO_NOT_USE
+#        define ucal_openTimeZoneIDEnumeration_48 ucal_openTimeZoneIDEnumeration_DRAFT_API_DO_NOT_USE
+#        define ucnv_isFixedWidth_48 ucnv_isFixedWidth_DRAFT_API_DO_NOT_USE
+#        define ucol_getEquivalentReorderCodes_48 ucol_getEquivalentReorderCodes_DRAFT_API_DO_NOT_USE
+#        define ucol_getReorderCodes_48 ucol_getReorderCodes_DRAFT_API_DO_NOT_USE
+#        define ucol_setReorderCodes_48 ucol_setReorderCodes_DRAFT_API_DO_NOT_USE
+#        define ucurr_isAvailable_48 ucurr_isAvailable_DRAFT_API_DO_NOT_USE
+#        define uidna_close_48 uidna_close_DRAFT_API_DO_NOT_USE
+#        define uidna_openUTS46_48 uidna_openUTS46_DRAFT_API_DO_NOT_USE
+#        define uloc_forLanguageTag_48 uloc_forLanguageTag_DRAFT_API_DO_NOT_USE
+#        define uloc_toLanguageTag_48 uloc_toLanguageTag_DRAFT_API_DO_NOT_USE
+#        define unorm2_getDecomposition_48 unorm2_getDecomposition_DRAFT_API_DO_NOT_USE
+#        define uregex_end64_48 uregex_end64_DRAFT_API_DO_NOT_USE
+#        define uregex_find64_48 uregex_find64_DRAFT_API_DO_NOT_USE
+#        define uregex_getFindProgressCallback_48 uregex_getFindProgressCallback_DRAFT_API_DO_NOT_USE
+#        define uregex_lookingAt64_48 uregex_lookingAt64_DRAFT_API_DO_NOT_USE
+#        define uregex_matches64_48 uregex_matches64_DRAFT_API_DO_NOT_USE
+#        define uregex_patternUText_48 uregex_patternUText_DRAFT_API_DO_NOT_USE
+#        define uregex_regionEnd64_48 uregex_regionEnd64_DRAFT_API_DO_NOT_USE
+#        define uregex_regionStart64_48 uregex_regionStart64_DRAFT_API_DO_NOT_USE
+#        define uregex_reset64_48 uregex_reset64_DRAFT_API_DO_NOT_USE
+#        define uregex_setFindProgressCallback_48 uregex_setFindProgressCallback_DRAFT_API_DO_NOT_USE
+#        define uregex_setRegion64_48 uregex_setRegion64_DRAFT_API_DO_NOT_USE
+#        define uregex_setRegionAndStart_48 uregex_setRegionAndStart_DRAFT_API_DO_NOT_USE
+#        define uregex_start64_48 uregex_start64_DRAFT_API_DO_NOT_USE
+#        define uscript_getScriptExtensions_48 uscript_getScriptExtensions_DRAFT_API_DO_NOT_USE
+#        define uscript_hasScript_48 uscript_hasScript_DRAFT_API_DO_NOT_USE
 #    endif /* U_DISABLE_RENAMING */
 
 #endif /* U_HIDE_DRAFT_API */

diff --git a/icu4c/source/common/unicode/uintrnal.h b/icu4c/source/common/unicode/uintrnal.h
index c62f11ac39cf001db7ba9e6194ef11002034c39c..11446e0ff3ce50782878923106ee9b4ede27d8a6 100644 (file)
--- a/icu4c/source/common/unicode/uintrnal.h
+++ b/icu4c/source/common/unicode/uintrnal.h
@@ -24,219 +24,213 @@
 #ifdef U_HIDE_INTERNAL_API
 
 #    if U_DISABLE_RENAMING
-#        define LE_ARRAY_SIZE(array) LE_ARRAY_SIZE(array)_INTERNAL_API_DO_NOT_USE
-#        define RegexPatternDump(pat) RegexPatternDump(pat)_INTERNAL_API_DO_NOT_USE
-#        define bms_close(BMS *bms) bms_close(BMS *bms)_INTERNAL_API_DO_NOT_USE
-#        define bms_empty(BMS *bms) bms_empty(BMS *bms)_INTERNAL_API_DO_NOT_USE
-#        define bms_getData(BMS *bms) bms_getData(BMS *bms)_INTERNAL_API_DO_NOT_USE
-#        define bms_open(UCD *ucd, const UChar *pattern, int32_t patternLength, const UChar *target, int32_t targetLength, UErrorCode *status) bms_open(UCD *ucd, const UChar *pattern, int32_t patternLength, const UChar *target, int32_t targetLength, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define bms_search(BMS *bms, int32_t offset, int32_t *start, int32_t *end) bms_search(BMS *bms, int32_t offset, int32_t *start, int32_t *end)_INTERNAL_API_DO_NOT_USE
-#        define bms_setTargetString(BMS *bms, const UChar *target, int32_t targetLength, UErrorCode *status) bms_setTargetString(BMS *bms, const UChar *target, int32_t targetLength, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define pl_addFontRun(pl_fontRuns *fontRuns, const le_font *font, le_int32 limit) pl_addFontRun(pl_fontRuns *fontRuns, const le_font *font, le_int32 limit)_INTERNAL_API_DO_NOT_USE
-#        define pl_addLocaleRun(pl_localeRuns *localeRuns, const char *locale, le_int32 limit) pl_addLocaleRun(pl_localeRuns *localeRuns, const char *locale, le_int32 limit)_INTERNAL_API_DO_NOT_USE
-#        define pl_addValueRun(pl_valueRuns *valueRuns, le_int32 value, le_int32 limit) pl_addValueRun(pl_valueRuns *valueRuns, le_int32 value, le_int32 limit)_INTERNAL_API_DO_NOT_USE
-#        define pl_close(pl_paragraph *paragraph) pl_close(pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_closeFontRuns(pl_fontRuns *fontRuns) pl_closeFontRuns(pl_fontRuns *fontRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_closeLine(pl_line *line) pl_closeLine(pl_line *line)_INTERNAL_API_DO_NOT_USE
-#        define pl_closeLocaleRuns(pl_localeRuns *localeRuns) pl_closeLocaleRuns(pl_localeRuns *localeRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_closeValueRuns(pl_valueRuns *valueRuns) pl_closeValueRuns(pl_valueRuns *valueRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_countLineRuns(const pl_line *line) pl_countLineRuns(const pl_line *line)_INTERNAL_API_DO_NOT_USE
-#        define pl_getAscent(const pl_paragraph *paragraph) pl_getAscent(const pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_getDescent(const pl_paragraph *paragraph) pl_getDescent(const pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_getFontRunCount(const pl_fontRuns *fontRuns) pl_getFontRunCount(const pl_fontRuns *fontRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_getFontRunFont(const pl_fontRuns *fontRuns, le_int32 run) pl_getFontRunFont(const pl_fontRuns *fontRuns, le_int32 run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getFontRunLastLimit(const pl_fontRuns *fontRuns) pl_getFontRunLastLimit(const pl_fontRuns *fontRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_getFontRunLimit(const pl_fontRuns *fontRuns, le_int32 run) pl_getFontRunLimit(const pl_fontRuns *fontRuns, le_int32 run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLeading(const pl_paragraph *paragraph) pl_getLeading(const pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLineAscent(const pl_line *line) pl_getLineAscent(const pl_line *line)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLineDescent(const pl_line *line) pl_getLineDescent(const pl_line *line)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLineLeading(const pl_line *line) pl_getLineLeading(const pl_line *line)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLineVisualRun(const pl_line *line, le_int32 runIndex) pl_getLineVisualRun(const pl_line *line, le_int32 runIndex)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLineWidth(const pl_line *line) pl_getLineWidth(const pl_line *line)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLocaleRunCount(const pl_localeRuns *localeRuns) pl_getLocaleRunCount(const pl_localeRuns *localeRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLocaleRunLastLimit(const pl_localeRuns *localeRuns) pl_getLocaleRunLastLimit(const pl_localeRuns *localeRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLocaleRunLimit(const pl_localeRuns *localeRuns, le_int32 run) pl_getLocaleRunLimit(const pl_localeRuns *localeRuns, le_int32 run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLocaleRunLocale(const pl_localeRuns *localeRuns, le_int32 run) pl_getLocaleRunLocale(const pl_localeRuns *localeRuns, le_int32 run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getParagraphLevel(pl_paragraph *paragraph) pl_getParagraphLevel(pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_getTextDirection(pl_paragraph *paragraph) pl_getTextDirection(pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_getValueRunCount(const pl_valueRuns *valueRuns) pl_getValueRunCount(const pl_valueRuns *valueRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_getValueRunLastLimit(const pl_valueRuns *valueRuns) pl_getValueRunLastLimit(const pl_valueRuns *valueRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_getValueRunLimit(const pl_valueRuns *valueRuns, le_int32 run) pl_getValueRunLimit(const pl_valueRuns *valueRuns, le_int32 run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getValueRunValue(const pl_valueRuns *valueRuns, le_int32 run) pl_getValueRunValue(const pl_valueRuns *valueRuns, le_int32 run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunAscent(const pl_visualRun *run) pl_getVisualRunAscent(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunDescent(const pl_visualRun *run) pl_getVisualRunDescent(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunDirection(const pl_visualRun *run) pl_getVisualRunDirection(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunFont(const pl_visualRun *run) pl_getVisualRunFont(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunGlyphCount(const pl_visualRun *run) pl_getVisualRunGlyphCount(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunGlyphToCharMap(const pl_visualRun *run) pl_getVisualRunGlyphToCharMap(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunGlyphs(const pl_visualRun *run) pl_getVisualRunGlyphs(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunLeading(const pl_visualRun *run) pl_getVisualRunLeading(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunPositions(const pl_visualRun *run) pl_getVisualRunPositions(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
+#        define RegexPatternDump RegexPatternDump_INTERNAL_API_DO_NOT_USE
+#        define bms_close bms_close_INTERNAL_API_DO_NOT_USE
+#        define bms_empty bms_empty_INTERNAL_API_DO_NOT_USE
+#        define bms_getData bms_getData_INTERNAL_API_DO_NOT_USE
+#        define bms_open bms_open_INTERNAL_API_DO_NOT_USE
+#        define bms_search bms_search_INTERNAL_API_DO_NOT_USE
+#        define bms_setTargetString bms_setTargetString_INTERNAL_API_DO_NOT_USE
+#        define pl_addFontRun pl_addFontRun_INTERNAL_API_DO_NOT_USE
+#        define pl_addLocaleRun pl_addLocaleRun_INTERNAL_API_DO_NOT_USE
+#        define pl_addValueRun pl_addValueRun_INTERNAL_API_DO_NOT_USE
+#        define pl_close pl_close_INTERNAL_API_DO_NOT_USE
+#        define pl_closeFontRuns pl_closeFontRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_closeLine pl_closeLine_INTERNAL_API_DO_NOT_USE
+#        define pl_closeLocaleRuns pl_closeLocaleRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_closeValueRuns pl_closeValueRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_countLineRuns pl_countLineRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_getAscent pl_getAscent_INTERNAL_API_DO_NOT_USE
+#        define pl_getDescent pl_getDescent_INTERNAL_API_DO_NOT_USE
+#        define pl_getFontRunCount pl_getFontRunCount_INTERNAL_API_DO_NOT_USE
+#        define pl_getFontRunFont pl_getFontRunFont_INTERNAL_API_DO_NOT_USE
+#        define pl_getFontRunLastLimit pl_getFontRunLastLimit_INTERNAL_API_DO_NOT_USE
+#        define pl_getFontRunLimit pl_getFontRunLimit_INTERNAL_API_DO_NOT_USE
+#        define pl_getLeading pl_getLeading_INTERNAL_API_DO_NOT_USE
+#        define pl_getLineAscent pl_getLineAscent_INTERNAL_API_DO_NOT_USE
+#        define pl_getLineDescent pl_getLineDescent_INTERNAL_API_DO_NOT_USE
+#        define pl_getLineLeading pl_getLineLeading_INTERNAL_API_DO_NOT_USE
+#        define pl_getLineVisualRun pl_getLineVisualRun_INTERNAL_API_DO_NOT_USE
+#        define pl_getLineWidth pl_getLineWidth_INTERNAL_API_DO_NOT_USE
+#        define pl_getLocaleRunCount pl_getLocaleRunCount_INTERNAL_API_DO_NOT_USE
+#        define pl_getLocaleRunLastLimit pl_getLocaleRunLastLimit_INTERNAL_API_DO_NOT_USE
+#        define pl_getLocaleRunLimit pl_getLocaleRunLimit_INTERNAL_API_DO_NOT_USE
+#        define pl_getLocaleRunLocale pl_getLocaleRunLocale_INTERNAL_API_DO_NOT_USE
+#        define pl_getParagraphLevel pl_getParagraphLevel_INTERNAL_API_DO_NOT_USE
+#        define pl_getTextDirection pl_getTextDirection_INTERNAL_API_DO_NOT_USE
+#        define pl_getValueRunCount pl_getValueRunCount_INTERNAL_API_DO_NOT_USE
+#        define pl_getValueRunLastLimit pl_getValueRunLastLimit_INTERNAL_API_DO_NOT_USE
+#        define pl_getValueRunLimit pl_getValueRunLimit_INTERNAL_API_DO_NOT_USE
+#        define pl_getValueRunValue pl_getValueRunValue_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunAscent pl_getVisualRunAscent_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunDescent pl_getVisualRunDescent_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunDirection pl_getVisualRunDirection_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunFont pl_getVisualRunFont_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunGlyphCount pl_getVisualRunGlyphCount_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunGlyphToCharMap pl_getVisualRunGlyphToCharMap_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunGlyphs pl_getVisualRunGlyphs_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunLeading pl_getVisualRunLeading_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunPositions pl_getVisualRunPositions_INTERNAL_API_DO_NOT_USE
 #        define pl_line pl_line_INTERNAL_API_DO_NOT_USE
-#        define pl_nextLine(pl_paragraph *paragraph, float width) pl_nextLine(pl_paragraph *paragraph, float width)_INTERNAL_API_DO_NOT_USE
-#        define pl_openEmptyFontRuns(le_int32 initialCapacity) pl_openEmptyFontRuns(le_int32 initialCapacity)_INTERNAL_API_DO_NOT_USE
-#        define pl_openEmptyLocaleRuns(le_int32 initialCapacity) pl_openEmptyLocaleRuns(le_int32 initialCapacity)_INTERNAL_API_DO_NOT_USE
-#        define pl_openEmptyValueRuns(le_int32 initialCapacity) pl_openEmptyValueRuns(le_int32 initialCapacity)_INTERNAL_API_DO_NOT_USE
-#        define pl_openFontRuns(const le_font **fonts, const le_int32 *limits, le_int32 count) pl_openFontRuns(const le_font **fonts, const le_int32 *limits, le_int32 count)_INTERNAL_API_DO_NOT_USE
-#        define pl_openLocaleRuns(const char **locales, const le_int32 *limits, le_int32 count) pl_openLocaleRuns(const char **locales, const le_int32 *limits, le_int32 count)_INTERNAL_API_DO_NOT_USE
-#        define pl_openValueRuns(const le_int32 *values, const le_int32 *limits, le_int32 count) pl_openValueRuns(const le_int32 *values, const le_int32 *limits, le_int32 count)_INTERNAL_API_DO_NOT_USE
+#        define pl_nextLine pl_nextLine_INTERNAL_API_DO_NOT_USE
+#        define pl_openEmptyFontRuns pl_openEmptyFontRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_openEmptyLocaleRuns pl_openEmptyLocaleRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_openEmptyValueRuns pl_openEmptyValueRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_openFontRuns pl_openFontRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_openLocaleRuns pl_openLocaleRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_openValueRuns pl_openValueRuns_INTERNAL_API_DO_NOT_USE
 #        define pl_paragraph pl_paragraph_INTERNAL_API_DO_NOT_USE
-#        define pl_reflow(pl_paragraph *paragraph) pl_reflow(pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_resetFontRuns(pl_fontRuns *fontRuns) pl_resetFontRuns(pl_fontRuns *fontRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_resetLocaleRuns(pl_localeRuns *localeRuns) pl_resetLocaleRuns(pl_localeRuns *localeRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_resetValueRuns(pl_valueRuns *valueRuns) pl_resetValueRuns(pl_valueRuns *valueRuns)_INTERNAL_API_DO_NOT_USE
+#        define pl_reflow pl_reflow_INTERNAL_API_DO_NOT_USE
+#        define pl_resetFontRuns pl_resetFontRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_resetLocaleRuns pl_resetLocaleRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_resetValueRuns pl_resetValueRuns_INTERNAL_API_DO_NOT_USE
 #        define pl_visualRun pl_visualRun_INTERNAL_API_DO_NOT_USE
-#        define ucd_close(UCD *ucd) ucd_close(UCD *ucd)_INTERNAL_API_DO_NOT_USE
-#        define ucd_flushCache() ucd_flushCache()_INTERNAL_API_DO_NOT_USE
-#        define ucd_freeCache() ucd_freeCache()_INTERNAL_API_DO_NOT_USE
-#        define ucd_getCollator(UCD *ucd) ucd_getCollator(UCD *ucd)_INTERNAL_API_DO_NOT_USE
-#        define ucd_open(UCollator *coll, UErrorCode *status) ucd_open(UCollator *coll, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define ucol_equals(const UCollator *source, const UCollator *target) ucol_equals(const UCollator *source, const UCollator *target)_INTERNAL_API_DO_NOT_USE
-#        define ucol_forceHanImplicit(UCollationElements *elems, UErrorCode *status) ucol_forceHanImplicit(UCollationElements *elems, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define ucol_forgetUCA(void) ucol_forgetUCA(void)_INTERNAL_API_DO_NOT_USE
-#        define ucol_getAttributeOrDefault(const UCollator *coll, UColAttribute attr, UErrorCode *status) ucol_getAttributeOrDefault(const UCollator *coll, UColAttribute attr, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define ucol_getReorderCodes(const UCollator *coll, int32_t *dest, int32_t destCapacity, UErrorCode *pErrorCode) ucol_getReorderCodes(const UCollator *coll, int32_t *dest, int32_t destCapacity, UErrorCode *pErrorCode)_INTERNAL_API_DO_NOT_USE
-#        define ucol_getUnsafeSet(const UCollator *coll, USet *unsafe, UErrorCode *status) ucol_getUnsafeSet(const UCollator *coll, USet *unsafe, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define ucol_nextProcessed(UCollationElements *elems, int32_t *ixLow, int32_t *ixHigh, UErrorCode *status) ucol_nextProcessed(UCollationElements *elems, int32_t *ixLow, int32_t *ixHigh, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define ucol_previousProcessed(UCollationElements *elems, int32_t *ixLow, int32_t *ixHigh, UErrorCode *status) ucol_previousProcessed(UCollationElements *elems, int32_t *ixLow, int32_t *ixHigh, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define ucol_setReorderCodes(UCollator *coll, const int32_t *reorderCodes, int32_t reorderCodesLength, UErrorCode *pErrorCode) ucol_setReorderCodes(UCollator *coll, const int32_t *reorderCodes, int32_t reorderCodesLength, UErrorCode *pErrorCode)_INTERNAL_API_DO_NOT_USE
-#        define udat_applyPatternRelative(UDateFormat *format, const UChar *datePattern, int32_t datePatternLength, const UChar *timePattern, int32_t timePatternLength, UErrorCode *status) udat_applyPatternRelative(UDateFormat *format, const UChar *datePattern, int32_t datePatternLength, const UChar *timePattern, int32_t timePatternLength, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define udat_toPatternRelativeDate(const UDateFormat *fmt, UChar *result, int32_t resultLength, UErrorCode *status) udat_toPatternRelativeDate(const UDateFormat *fmt, UChar *result, int32_t resultLength, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define udat_toPatternRelativeTime(const UDateFormat *fmt, UChar *result, int32_t resultLength, UErrorCode *status) udat_toPatternRelativeTime(const UDateFormat *fmt, UChar *result, int32_t resultLength, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getConfiguration(UPlugData *plug) uplug_getConfiguration(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getContext(UPlugData *plug) uplug_getContext(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getCurrentLevel(void) uplug_getCurrentLevel(void)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getLibrary(UPlugData *plug) uplug_getLibrary(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getLibraryName(UPlugData *plug, UErrorCode *status) uplug_getLibraryName(UPlugData *plug, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getPlugLevel(UPlugData *plug) uplug_getPlugLevel(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getPlugLoadStatus(UPlugData *plug) uplug_getPlugLoadStatus(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getPlugName(UPlugData *plug) uplug_getPlugName(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getSymbolName(UPlugData *plug) uplug_getSymbolName(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_loadPlugFromEntrypoint(UPlugEntrypoint *entrypoint, const char *config, UErrorCode *status) uplug_loadPlugFromEntrypoint(UPlugEntrypoint *entrypoint, const char *config, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define uplug_loadPlugFromLibrary(const char *libName, const char *sym, const char *config, UErrorCode *status) uplug_loadPlugFromLibrary(const char *libName, const char *sym, const char *config, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define uplug_nextPlug(UPlugData *prior) uplug_nextPlug(UPlugData *prior)_INTERNAL_API_DO_NOT_USE
-#        define uplug_removePlug(UPlugData *plug, UErrorCode *status) uplug_removePlug(UPlugData *plug, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define uplug_setContext(UPlugData *plug, void *context) uplug_setContext(UPlugData *plug, void *context)_INTERNAL_API_DO_NOT_USE
-#        define uplug_setPlugLevel(UPlugData *plug, UPlugLevel level) uplug_setPlugLevel(UPlugData *plug, UPlugLevel level)_INTERNAL_API_DO_NOT_USE
-#        define uplug_setPlugName(UPlugData *plug, const char *name) uplug_setPlugName(UPlugData *plug, const char *name)_INTERNAL_API_DO_NOT_USE
-#        define uplug_setPlugNoUnload(UPlugData *plug, UBool dontUnload) uplug_setPlugNoUnload(UPlugData *plug, UBool dontUnload)_INTERNAL_API_DO_NOT_USE
-#        define uprv_getDefaultCodepage(void) uprv_getDefaultCodepage(void)_INTERNAL_API_DO_NOT_USE
-#        define uprv_getDefaultLocaleID(void) uprv_getDefaultLocaleID(void)_INTERNAL_API_DO_NOT_USE
-#        define ures_openFillIn(UResourceBundle *r, const char *packageName, const char *localeID, UErrorCode *status) ures_openFillIn(UResourceBundle *r, const char *packageName, const char *localeID, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define usearch_search(UStringSearch *strsrch, int32_t startIdx, int32_t *matchStart, int32_t *matchLimit, UErrorCode *status) usearch_search(UStringSearch *strsrch, int32_t startIdx, int32_t *matchStart, int32_t *matchLimit, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define usearch_searchBackwards(UStringSearch *strsrch, int32_t startIdx, int32_t *matchStart, int32_t *matchLimit, UErrorCode *status) usearch_searchBackwards(UStringSearch *strsrch, int32_t startIdx, int32_t *matchStart, int32_t *matchLimit, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define utf8_appendCharSafeBody(uint8_t *s, int32_t i, int32_t length, UChar32 c, UBool *pIsError) utf8_appendCharSafeBody(uint8_t *s, int32_t i, int32_t length, UChar32 c, UBool *pIsError)_INTERNAL_API_DO_NOT_USE
-#        define utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i) utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i)_INTERNAL_API_DO_NOT_USE
-#        define utf8_countTrailBytes[256] utf8_countTrailBytes[256]_INTERNAL_API_DO_NOT_USE
-#        define utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, UChar32 c, UBool strict) utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, UChar32 c, UBool strict)_INTERNAL_API_DO_NOT_USE
-#        define utf8_prevCharSafeBody(const uint8_t *s, int32_t start, int32_t *pi, UChar32 c, UBool strict) utf8_prevCharSafeBody(const uint8_t *s, int32_t start, int32_t *pi, UChar32 c, UBool strict)_INTERNAL_API_DO_NOT_USE
+#        define ucd_close ucd_close_INTERNAL_API_DO_NOT_USE
+#        define ucd_flushCache ucd_flushCache_INTERNAL_API_DO_NOT_USE
+#        define ucd_freeCache ucd_freeCache_INTERNAL_API_DO_NOT_USE
+#        define ucd_getCollator ucd_getCollator_INTERNAL_API_DO_NOT_USE
+#        define ucd_open ucd_open_INTERNAL_API_DO_NOT_USE
+#        define ucol_equals ucol_equals_INTERNAL_API_DO_NOT_USE
+#        define ucol_forceHanImplicit ucol_forceHanImplicit_INTERNAL_API_DO_NOT_USE
+#        define ucol_forgetUCA ucol_forgetUCA_INTERNAL_API_DO_NOT_USE
+#        define ucol_getAttributeOrDefault ucol_getAttributeOrDefault_INTERNAL_API_DO_NOT_USE
+#        define ucol_getUnsafeSet ucol_getUnsafeSet_INTERNAL_API_DO_NOT_USE
+#        define ucol_nextProcessed ucol_nextProcessed_INTERNAL_API_DO_NOT_USE
+#        define ucol_previousProcessed ucol_previousProcessed_INTERNAL_API_DO_NOT_USE
+#        define udat_applyPatternRelative udat_applyPatternRelative_INTERNAL_API_DO_NOT_USE
+#        define udat_toPatternRelativeDate udat_toPatternRelativeDate_INTERNAL_API_DO_NOT_USE
+#        define udat_toPatternRelativeTime udat_toPatternRelativeTime_INTERNAL_API_DO_NOT_USE
+#        define uplug_getConfiguration uplug_getConfiguration_INTERNAL_API_DO_NOT_USE
+#        define uplug_getContext uplug_getContext_INTERNAL_API_DO_NOT_USE
+#        define uplug_getCurrentLevel uplug_getCurrentLevel_INTERNAL_API_DO_NOT_USE
+#        define uplug_getLibrary uplug_getLibrary_INTERNAL_API_DO_NOT_USE
+#        define uplug_getLibraryName uplug_getLibraryName_INTERNAL_API_DO_NOT_USE
+#        define uplug_getPlugLevel uplug_getPlugLevel_INTERNAL_API_DO_NOT_USE
+#        define uplug_getPlugLoadStatus uplug_getPlugLoadStatus_INTERNAL_API_DO_NOT_USE
+#        define uplug_getPlugName uplug_getPlugName_INTERNAL_API_DO_NOT_USE
+#        define uplug_getSymbolName uplug_getSymbolName_INTERNAL_API_DO_NOT_USE
+#        define uplug_loadPlugFromEntrypoint uplug_loadPlugFromEntrypoint_INTERNAL_API_DO_NOT_USE
+#        define uplug_loadPlugFromLibrary uplug_loadPlugFromLibrary_INTERNAL_API_DO_NOT_USE
+#        define uplug_nextPlug uplug_nextPlug_INTERNAL_API_DO_NOT_USE
+#        define uplug_removePlug uplug_removePlug_INTERNAL_API_DO_NOT_USE
+#        define uplug_setContext uplug_setContext_INTERNAL_API_DO_NOT_USE
+#        define uplug_setPlugLevel uplug_setPlugLevel_INTERNAL_API_DO_NOT_USE
+#        define uplug_setPlugName uplug_setPlugName_INTERNAL_API_DO_NOT_USE
+#        define uplug_setPlugNoUnload uplug_setPlugNoUnload_INTERNAL_API_DO_NOT_USE
+#        define uprv_getDefaultCodepage uprv_getDefaultCodepage_INTERNAL_API_DO_NOT_USE
+#        define uprv_getDefaultLocaleID uprv_getDefaultLocaleID_INTERNAL_API_DO_NOT_USE
+#        define ures_openFillIn ures_openFillIn_INTERNAL_API_DO_NOT_USE
+#        define usearch_search usearch_search_INTERNAL_API_DO_NOT_USE
+#        define usearch_searchBackwards usearch_searchBackwards_INTERNAL_API_DO_NOT_USE
+#        define utf8_appendCharSafeBody utf8_appendCharSafeBody_INTERNAL_API_DO_NOT_USE
+#        define utf8_back1SafeBody utf8_back1SafeBody_INTERNAL_API_DO_NOT_USE
+#        define utf8_countTrailBytes utf8_countTrailBytes_INTERNAL_API_DO_NOT_USE
+#        define utf8_nextCharSafeBody utf8_nextCharSafeBody_INTERNAL_API_DO_NOT_USE
+#        define utf8_prevCharSafeBody utf8_prevCharSafeBody_INTERNAL_API_DO_NOT_USE
 #    else
-#        define LE_ARRAY_SIZE(array)_4_7 LE_ARRAY_SIZE(array)_INTERNAL_API_DO_NOT_USE
-#        define RegexPatternDump(pat)_4_7 RegexPatternDump(pat)_INTERNAL_API_DO_NOT_USE
-#        define bms_close(BMS *bms)_4_7 bms_close(BMS *bms)_INTERNAL_API_DO_NOT_USE
-#        define bms_empty(BMS *bms)_4_7 bms_empty(BMS *bms)_INTERNAL_API_DO_NOT_USE
-#        define bms_getData(BMS *bms)_4_7 bms_getData(BMS *bms)_INTERNAL_API_DO_NOT_USE
-#        define bms_open(UCD *ucd, const UChar *pattern, int32_t patternLength, const UChar *target, int32_t targetLength, UErrorCode *status)_4_7 bms_open(UCD *ucd, const UChar *pattern, int32_t patternLength, const UChar *target, int32_t targetLength, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define bms_search(BMS *bms, int32_t offset, int32_t *start, int32_t *end)_4_7 bms_search(BMS *bms, int32_t offset, int32_t *start, int32_t *end)_INTERNAL_API_DO_NOT_USE
-#        define bms_setTargetString(BMS *bms, const UChar *target, int32_t targetLength, UErrorCode *status)_4_7 bms_setTargetString(BMS *bms, const UChar *target, int32_t targetLength, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define pl_addFontRun(pl_fontRuns *fontRuns, const le_font *font, le_int32 limit)_4_7 pl_addFontRun(pl_fontRuns *fontRuns, const le_font *font, le_int32 limit)_INTERNAL_API_DO_NOT_USE
-#        define pl_addLocaleRun(pl_localeRuns *localeRuns, const char *locale, le_int32 limit)_4_7 pl_addLocaleRun(pl_localeRuns *localeRuns, const char *locale, le_int32 limit)_INTERNAL_API_DO_NOT_USE
-#        define pl_addValueRun(pl_valueRuns *valueRuns, le_int32 value, le_int32 limit)_4_7 pl_addValueRun(pl_valueRuns *valueRuns, le_int32 value, le_int32 limit)_INTERNAL_API_DO_NOT_USE
-#        define pl_close(pl_paragraph *paragraph)_4_7 pl_close(pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_closeFontRuns(pl_fontRuns *fontRuns)_4_7 pl_closeFontRuns(pl_fontRuns *fontRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_closeLine(pl_line *line)_4_7 pl_closeLine(pl_line *line)_INTERNAL_API_DO_NOT_USE
-#        define pl_closeLocaleRuns(pl_localeRuns *localeRuns)_4_7 pl_closeLocaleRuns(pl_localeRuns *localeRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_closeValueRuns(pl_valueRuns *valueRuns)_4_7 pl_closeValueRuns(pl_valueRuns *valueRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_countLineRuns(const pl_line *line)_4_7 pl_countLineRuns(const pl_line *line)_INTERNAL_API_DO_NOT_USE
-#        define pl_getAscent(const pl_paragraph *paragraph)_4_7 pl_getAscent(const pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_getDescent(const pl_paragraph *paragraph)_4_7 pl_getDescent(const pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_getFontRunCount(const pl_fontRuns *fontRuns)_4_7 pl_getFontRunCount(const pl_fontRuns *fontRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_getFontRunFont(const pl_fontRuns *fontRuns, le_int32 run)_4_7 pl_getFontRunFont(const pl_fontRuns *fontRuns, le_int32 run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getFontRunLastLimit(const pl_fontRuns *fontRuns)_4_7 pl_getFontRunLastLimit(const pl_fontRuns *fontRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_getFontRunLimit(const pl_fontRuns *fontRuns, le_int32 run)_4_7 pl_getFontRunLimit(const pl_fontRuns *fontRuns, le_int32 run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLeading(const pl_paragraph *paragraph)_4_7 pl_getLeading(const pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLineAscent(const pl_line *line)_4_7 pl_getLineAscent(const pl_line *line)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLineDescent(const pl_line *line)_4_7 pl_getLineDescent(const pl_line *line)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLineLeading(const pl_line *line)_4_7 pl_getLineLeading(const pl_line *line)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLineVisualRun(const pl_line *line, le_int32 runIndex)_4_7 pl_getLineVisualRun(const pl_line *line, le_int32 runIndex)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLineWidth(const pl_line *line)_4_7 pl_getLineWidth(const pl_line *line)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLocaleRunCount(const pl_localeRuns *localeRuns)_4_7 pl_getLocaleRunCount(const pl_localeRuns *localeRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLocaleRunLastLimit(const pl_localeRuns *localeRuns)_4_7 pl_getLocaleRunLastLimit(const pl_localeRuns *localeRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLocaleRunLimit(const pl_localeRuns *localeRuns, le_int32 run)_4_7 pl_getLocaleRunLimit(const pl_localeRuns *localeRuns, le_int32 run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getLocaleRunLocale(const pl_localeRuns *localeRuns, le_int32 run)_4_7 pl_getLocaleRunLocale(const pl_localeRuns *localeRuns, le_int32 run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getParagraphLevel(pl_paragraph *paragraph)_4_7 pl_getParagraphLevel(pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_getTextDirection(pl_paragraph *paragraph)_4_7 pl_getTextDirection(pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_getValueRunCount(const pl_valueRuns *valueRuns)_4_7 pl_getValueRunCount(const pl_valueRuns *valueRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_getValueRunLastLimit(const pl_valueRuns *valueRuns)_4_7 pl_getValueRunLastLimit(const pl_valueRuns *valueRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_getValueRunLimit(const pl_valueRuns *valueRuns, le_int32 run)_4_7 pl_getValueRunLimit(const pl_valueRuns *valueRuns, le_int32 run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getValueRunValue(const pl_valueRuns *valueRuns, le_int32 run)_4_7 pl_getValueRunValue(const pl_valueRuns *valueRuns, le_int32 run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunAscent(const pl_visualRun *run)_4_7 pl_getVisualRunAscent(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunDescent(const pl_visualRun *run)_4_7 pl_getVisualRunDescent(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunDirection(const pl_visualRun *run)_4_7 pl_getVisualRunDirection(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunFont(const pl_visualRun *run)_4_7 pl_getVisualRunFont(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunGlyphCount(const pl_visualRun *run)_4_7 pl_getVisualRunGlyphCount(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunGlyphToCharMap(const pl_visualRun *run)_4_7 pl_getVisualRunGlyphToCharMap(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunGlyphs(const pl_visualRun *run)_4_7 pl_getVisualRunGlyphs(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunLeading(const pl_visualRun *run)_4_7 pl_getVisualRunLeading(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_getVisualRunPositions(const pl_visualRun *run)_4_7 pl_getVisualRunPositions(const pl_visualRun *run)_INTERNAL_API_DO_NOT_USE
-#        define pl_line_4_7 pl_line_INTERNAL_API_DO_NOT_USE
-#        define pl_nextLine(pl_paragraph *paragraph, float width)_4_7 pl_nextLine(pl_paragraph *paragraph, float width)_INTERNAL_API_DO_NOT_USE
-#        define pl_openEmptyFontRuns(le_int32 initialCapacity)_4_7 pl_openEmptyFontRuns(le_int32 initialCapacity)_INTERNAL_API_DO_NOT_USE
-#        define pl_openEmptyLocaleRuns(le_int32 initialCapacity)_4_7 pl_openEmptyLocaleRuns(le_int32 initialCapacity)_INTERNAL_API_DO_NOT_USE
-#        define pl_openEmptyValueRuns(le_int32 initialCapacity)_4_7 pl_openEmptyValueRuns(le_int32 initialCapacity)_INTERNAL_API_DO_NOT_USE
-#        define pl_openFontRuns(const le_font **fonts, const le_int32 *limits, le_int32 count)_4_7 pl_openFontRuns(const le_font **fonts, const le_int32 *limits, le_int32 count)_INTERNAL_API_DO_NOT_USE
-#        define pl_openLocaleRuns(const char **locales, const le_int32 *limits, le_int32 count)_4_7 pl_openLocaleRuns(const char **locales, const le_int32 *limits, le_int32 count)_INTERNAL_API_DO_NOT_USE
-#        define pl_openValueRuns(const le_int32 *values, const le_int32 *limits, le_int32 count)_4_7 pl_openValueRuns(const le_int32 *values, const le_int32 *limits, le_int32 count)_INTERNAL_API_DO_NOT_USE
-#        define pl_paragraph_4_7 pl_paragraph_INTERNAL_API_DO_NOT_USE
-#        define pl_reflow(pl_paragraph *paragraph)_4_7 pl_reflow(pl_paragraph *paragraph)_INTERNAL_API_DO_NOT_USE
-#        define pl_resetFontRuns(pl_fontRuns *fontRuns)_4_7 pl_resetFontRuns(pl_fontRuns *fontRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_resetLocaleRuns(pl_localeRuns *localeRuns)_4_7 pl_resetLocaleRuns(pl_localeRuns *localeRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_resetValueRuns(pl_valueRuns *valueRuns)_4_7 pl_resetValueRuns(pl_valueRuns *valueRuns)_INTERNAL_API_DO_NOT_USE
-#        define pl_visualRun_4_7 pl_visualRun_INTERNAL_API_DO_NOT_USE
-#        define ucd_close(UCD *ucd)_4_7 ucd_close(UCD *ucd)_INTERNAL_API_DO_NOT_USE
-#        define ucd_flushCache()_4_7 ucd_flushCache()_INTERNAL_API_DO_NOT_USE
-#        define ucd_freeCache()_4_7 ucd_freeCache()_INTERNAL_API_DO_NOT_USE
-#        define ucd_getCollator(UCD *ucd)_4_7 ucd_getCollator(UCD *ucd)_INTERNAL_API_DO_NOT_USE
-#        define ucd_open(UCollator *coll, UErrorCode *status)_4_7 ucd_open(UCollator *coll, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define ucol_equals(const UCollator *source, const UCollator *target)_4_7 ucol_equals(const UCollator *source, const UCollator *target)_INTERNAL_API_DO_NOT_USE
-#        define ucol_forceHanImplicit(UCollationElements *elems, UErrorCode *status)_4_7 ucol_forceHanImplicit(UCollationElements *elems, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define ucol_forgetUCA(void)_4_7 ucol_forgetUCA(void)_INTERNAL_API_DO_NOT_USE
-#        define ucol_getAttributeOrDefault(const UCollator *coll, UColAttribute attr, UErrorCode *status)_4_7 ucol_getAttributeOrDefault(const UCollator *coll, UColAttribute attr, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define ucol_getReorderCodes(const UCollator *coll, int32_t *dest, int32_t destCapacity, UErrorCode *pErrorCode)_4_7 ucol_getReorderCodes(const UCollator *coll, int32_t *dest, int32_t destCapacity, UErrorCode *pErrorCode)_INTERNAL_API_DO_NOT_USE
-#        define ucol_getUnsafeSet(const UCollator *coll, USet *unsafe, UErrorCode *status)_4_7 ucol_getUnsafeSet(const UCollator *coll, USet *unsafe, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define ucol_nextProcessed(UCollationElements *elems, int32_t *ixLow, int32_t *ixHigh, UErrorCode *status)_4_7 ucol_nextProcessed(UCollationElements *elems, int32_t *ixLow, int32_t *ixHigh, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define ucol_previousProcessed(UCollationElements *elems, int32_t *ixLow, int32_t *ixHigh, UErrorCode *status)_4_7 ucol_previousProcessed(UCollationElements *elems, int32_t *ixLow, int32_t *ixHigh, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define ucol_setReorderCodes(UCollator *coll, const int32_t *reorderCodes, int32_t reorderCodesLength, UErrorCode *pErrorCode)_4_7 ucol_setReorderCodes(UCollator *coll, const int32_t *reorderCodes, int32_t reorderCodesLength, UErrorCode *pErrorCode)_INTERNAL_API_DO_NOT_USE
-#        define udat_applyPatternRelative(UDateFormat *format, const UChar *datePattern, int32_t datePatternLength, const UChar *timePattern, int32_t timePatternLength, UErrorCode *status)_4_7 udat_applyPatternRelative(UDateFormat *format, const UChar *datePattern, int32_t datePatternLength, const UChar *timePattern, int32_t timePatternLength, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define udat_toPatternRelativeDate(const UDateFormat *fmt, UChar *result, int32_t resultLength, UErrorCode *status)_4_7 udat_toPatternRelativeDate(const UDateFormat *fmt, UChar *result, int32_t resultLength, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define udat_toPatternRelativeTime(const UDateFormat *fmt, UChar *result, int32_t resultLength, UErrorCode *status)_4_7 udat_toPatternRelativeTime(const UDateFormat *fmt, UChar *result, int32_t resultLength, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getConfiguration(UPlugData *plug)_4_7 uplug_getConfiguration(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getContext(UPlugData *plug)_4_7 uplug_getContext(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getCurrentLevel(void)_4_7 uplug_getCurrentLevel(void)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getLibrary(UPlugData *plug)_4_7 uplug_getLibrary(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getLibraryName(UPlugData *plug, UErrorCode *status)_4_7 uplug_getLibraryName(UPlugData *plug, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getPlugLevel(UPlugData *plug)_4_7 uplug_getPlugLevel(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getPlugLoadStatus(UPlugData *plug)_4_7 uplug_getPlugLoadStatus(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getPlugName(UPlugData *plug)_4_7 uplug_getPlugName(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_getSymbolName(UPlugData *plug)_4_7 uplug_getSymbolName(UPlugData *plug)_INTERNAL_API_DO_NOT_USE
-#        define uplug_loadPlugFromEntrypoint(UPlugEntrypoint *entrypoint, const char *config, UErrorCode *status)_4_7 uplug_loadPlugFromEntrypoint(UPlugEntrypoint *entrypoint, const char *config, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define uplug_loadPlugFromLibrary(const char *libName, const char *sym, const char *config, UErrorCode *status)_4_7 uplug_loadPlugFromLibrary(const char *libName, const char *sym, const char *config, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define uplug_nextPlug(UPlugData *prior)_4_7 uplug_nextPlug(UPlugData *prior)_INTERNAL_API_DO_NOT_USE
-#        define uplug_removePlug(UPlugData *plug, UErrorCode *status)_4_7 uplug_removePlug(UPlugData *plug, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define uplug_setContext(UPlugData *plug, void *context)_4_7 uplug_setContext(UPlugData *plug, void *context)_INTERNAL_API_DO_NOT_USE
-#        define uplug_setPlugLevel(UPlugData *plug, UPlugLevel level)_4_7 uplug_setPlugLevel(UPlugData *plug, UPlugLevel level)_INTERNAL_API_DO_NOT_USE
-#        define uplug_setPlugName(UPlugData *plug, const char *name)_4_7 uplug_setPlugName(UPlugData *plug, const char *name)_INTERNAL_API_DO_NOT_USE
-#        define uplug_setPlugNoUnload(UPlugData *plug, UBool dontUnload)_4_7 uplug_setPlugNoUnload(UPlugData *plug, UBool dontUnload)_INTERNAL_API_DO_NOT_USE
-#        define uprv_getDefaultCodepage(void)_4_7 uprv_getDefaultCodepage(void)_INTERNAL_API_DO_NOT_USE
-#        define uprv_getDefaultLocaleID(void)_4_7 uprv_getDefaultLocaleID(void)_INTERNAL_API_DO_NOT_USE
-#        define ures_openFillIn(UResourceBundle *r, const char *packageName, const char *localeID, UErrorCode *status)_4_7 ures_openFillIn(UResourceBundle *r, const char *packageName, const char *localeID, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define usearch_search(UStringSearch *strsrch, int32_t startIdx, int32_t *matchStart, int32_t *matchLimit, UErrorCode *status)_4_7 usearch_search(UStringSearch *strsrch, int32_t startIdx, int32_t *matchStart, int32_t *matchLimit, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define usearch_searchBackwards(UStringSearch *strsrch, int32_t startIdx, int32_t *matchStart, int32_t *matchLimit, UErrorCode *status)_4_7 usearch_searchBackwards(UStringSearch *strsrch, int32_t startIdx, int32_t *matchStart, int32_t *matchLimit, UErrorCode *status)_INTERNAL_API_DO_NOT_USE
-#        define utf8_appendCharSafeBody(uint8_t *s, int32_t i, int32_t length, UChar32 c, UBool *pIsError)_4_7 utf8_appendCharSafeBody(uint8_t *s, int32_t i, int32_t length, UChar32 c, UBool *pIsError)_INTERNAL_API_DO_NOT_USE
-#        define utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i)_4_7 utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i)_INTERNAL_API_DO_NOT_USE
-#        define utf8_countTrailBytes[256]_4_7 utf8_countTrailBytes[256]_INTERNAL_API_DO_NOT_USE
-#        define utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, UChar32 c, UBool strict)_4_7 utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, UChar32 c, UBool strict)_INTERNAL_API_DO_NOT_USE
-#        define utf8_prevCharSafeBody(const uint8_t *s, int32_t start, int32_t *pi, UChar32 c, UBool strict)_4_7 utf8_prevCharSafeBody(const uint8_t *s, int32_t start, int32_t *pi, UChar32 c, UBool strict)_INTERNAL_API_DO_NOT_USE
+#        define RegexPatternDump_48 RegexPatternDump_INTERNAL_API_DO_NOT_USE
+#        define bms_close_48 bms_close_INTERNAL_API_DO_NOT_USE
+#        define bms_empty_48 bms_empty_INTERNAL_API_DO_NOT_USE
+#        define bms_getData_48 bms_getData_INTERNAL_API_DO_NOT_USE
+#        define bms_open_48 bms_open_INTERNAL_API_DO_NOT_USE
+#        define bms_search_48 bms_search_INTERNAL_API_DO_NOT_USE
+#        define bms_setTargetString_48 bms_setTargetString_INTERNAL_API_DO_NOT_USE
+#        define pl_addFontRun_48 pl_addFontRun_INTERNAL_API_DO_NOT_USE
+#        define pl_addLocaleRun_48 pl_addLocaleRun_INTERNAL_API_DO_NOT_USE
+#        define pl_addValueRun_48 pl_addValueRun_INTERNAL_API_DO_NOT_USE
+#        define pl_closeFontRuns_48 pl_closeFontRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_closeLine_48 pl_closeLine_INTERNAL_API_DO_NOT_USE
+#        define pl_closeLocaleRuns_48 pl_closeLocaleRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_closeValueRuns_48 pl_closeValueRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_close_48 pl_close_INTERNAL_API_DO_NOT_USE
+#        define pl_countLineRuns_48 pl_countLineRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_getAscent_48 pl_getAscent_INTERNAL_API_DO_NOT_USE
+#        define pl_getDescent_48 pl_getDescent_INTERNAL_API_DO_NOT_USE
+#        define pl_getFontRunCount_48 pl_getFontRunCount_INTERNAL_API_DO_NOT_USE
+#        define pl_getFontRunFont_48 pl_getFontRunFont_INTERNAL_API_DO_NOT_USE
+#        define pl_getFontRunLastLimit_48 pl_getFontRunLastLimit_INTERNAL_API_DO_NOT_USE
+#        define pl_getFontRunLimit_48 pl_getFontRunLimit_INTERNAL_API_DO_NOT_USE
+#        define pl_getLeading_48 pl_getLeading_INTERNAL_API_DO_NOT_USE
+#        define pl_getLineAscent_48 pl_getLineAscent_INTERNAL_API_DO_NOT_USE
+#        define pl_getLineDescent_48 pl_getLineDescent_INTERNAL_API_DO_NOT_USE
+#        define pl_getLineLeading_48 pl_getLineLeading_INTERNAL_API_DO_NOT_USE
+#        define pl_getLineVisualRun_48 pl_getLineVisualRun_INTERNAL_API_DO_NOT_USE
+#        define pl_getLineWidth_48 pl_getLineWidth_INTERNAL_API_DO_NOT_USE
+#        define pl_getLocaleRunCount_48 pl_getLocaleRunCount_INTERNAL_API_DO_NOT_USE
+#        define pl_getLocaleRunLastLimit_48 pl_getLocaleRunLastLimit_INTERNAL_API_DO_NOT_USE
+#        define pl_getLocaleRunLimit_48 pl_getLocaleRunLimit_INTERNAL_API_DO_NOT_USE
+#        define pl_getLocaleRunLocale_48 pl_getLocaleRunLocale_INTERNAL_API_DO_NOT_USE
+#        define pl_getParagraphLevel_48 pl_getParagraphLevel_INTERNAL_API_DO_NOT_USE
+#        define pl_getTextDirection_48 pl_getTextDirection_INTERNAL_API_DO_NOT_USE
+#        define pl_getValueRunCount_48 pl_getValueRunCount_INTERNAL_API_DO_NOT_USE
+#        define pl_getValueRunLastLimit_48 pl_getValueRunLastLimit_INTERNAL_API_DO_NOT_USE
+#        define pl_getValueRunLimit_48 pl_getValueRunLimit_INTERNAL_API_DO_NOT_USE
+#        define pl_getValueRunValue_48 pl_getValueRunValue_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunAscent_48 pl_getVisualRunAscent_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunDescent_48 pl_getVisualRunDescent_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunDirection_48 pl_getVisualRunDirection_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunFont_48 pl_getVisualRunFont_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunGlyphCount_48 pl_getVisualRunGlyphCount_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunGlyphToCharMap_48 pl_getVisualRunGlyphToCharMap_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunGlyphs_48 pl_getVisualRunGlyphs_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunLeading_48 pl_getVisualRunLeading_INTERNAL_API_DO_NOT_USE
+#        define pl_getVisualRunPositions_48 pl_getVisualRunPositions_INTERNAL_API_DO_NOT_USE
+#        define pl_line_48 pl_line_INTERNAL_API_DO_NOT_USE
+#        define pl_nextLine_48 pl_nextLine_INTERNAL_API_DO_NOT_USE
+#        define pl_openEmptyFontRuns_48 pl_openEmptyFontRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_openEmptyLocaleRuns_48 pl_openEmptyLocaleRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_openEmptyValueRuns_48 pl_openEmptyValueRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_openFontRuns_48 pl_openFontRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_openLocaleRuns_48 pl_openLocaleRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_openValueRuns_48 pl_openValueRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_paragraph_48 pl_paragraph_INTERNAL_API_DO_NOT_USE
+#        define pl_reflow_48 pl_reflow_INTERNAL_API_DO_NOT_USE
+#        define pl_resetFontRuns_48 pl_resetFontRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_resetLocaleRuns_48 pl_resetLocaleRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_resetValueRuns_48 pl_resetValueRuns_INTERNAL_API_DO_NOT_USE
+#        define pl_visualRun_48 pl_visualRun_INTERNAL_API_DO_NOT_USE
+#        define ucd_close_48 ucd_close_INTERNAL_API_DO_NOT_USE
+#        define ucd_flushCache_48 ucd_flushCache_INTERNAL_API_DO_NOT_USE
+#        define ucd_freeCache_48 ucd_freeCache_INTERNAL_API_DO_NOT_USE
+#        define ucd_getCollator_48 ucd_getCollator_INTERNAL_API_DO_NOT_USE
+#        define ucd_open_48 ucd_open_INTERNAL_API_DO_NOT_USE
+#        define ucol_equals_48 ucol_equals_INTERNAL_API_DO_NOT_USE
+#        define ucol_forceHanImplicit_48 ucol_forceHanImplicit_INTERNAL_API_DO_NOT_USE
+#        define ucol_forgetUCA_48 ucol_forgetUCA_INTERNAL_API_DO_NOT_USE
+#        define ucol_getAttributeOrDefault_48 ucol_getAttributeOrDefault_INTERNAL_API_DO_NOT_USE
+#        define ucol_getUnsafeSet_48 ucol_getUnsafeSet_INTERNAL_API_DO_NOT_USE
+#        define ucol_nextProcessed_48 ucol_nextProcessed_INTERNAL_API_DO_NOT_USE
+#        define ucol_previousProcessed_48 ucol_previousProcessed_INTERNAL_API_DO_NOT_USE
+#        define udat_applyPatternRelative_48 udat_applyPatternRelative_INTERNAL_API_DO_NOT_USE
+#        define udat_toPatternRelativeDate_48 udat_toPatternRelativeDate_INTERNAL_API_DO_NOT_USE
+#        define udat_toPatternRelativeTime_48 udat_toPatternRelativeTime_INTERNAL_API_DO_NOT_USE
+#        define uplug_getConfiguration_48 uplug_getConfiguration_INTERNAL_API_DO_NOT_USE
+#        define uplug_getContext_48 uplug_getContext_INTERNAL_API_DO_NOT_USE
+#        define uplug_getCurrentLevel_48 uplug_getCurrentLevel_INTERNAL_API_DO_NOT_USE
+#        define uplug_getLibraryName_48 uplug_getLibraryName_INTERNAL_API_DO_NOT_USE
+#        define uplug_getLibrary_48 uplug_getLibrary_INTERNAL_API_DO_NOT_USE
+#        define uplug_getPlugLevel_48 uplug_getPlugLevel_INTERNAL_API_DO_NOT_USE
+#        define uplug_getPlugLoadStatus_48 uplug_getPlugLoadStatus_INTERNAL_API_DO_NOT_USE
+#        define uplug_getPlugName_48 uplug_getPlugName_INTERNAL_API_DO_NOT_USE
+#        define uplug_getSymbolName_48 uplug_getSymbolName_INTERNAL_API_DO_NOT_USE
+#        define uplug_loadPlugFromEntrypoint_48 uplug_loadPlugFromEntrypoint_INTERNAL_API_DO_NOT_USE
+#        define uplug_loadPlugFromLibrary_48 uplug_loadPlugFromLibrary_INTERNAL_API_DO_NOT_USE
+#        define uplug_nextPlug_48 uplug_nextPlug_INTERNAL_API_DO_NOT_USE
+#        define uplug_removePlug_48 uplug_removePlug_INTERNAL_API_DO_NOT_USE
+#        define uplug_setContext_48 uplug_setContext_INTERNAL_API_DO_NOT_USE
+#        define uplug_setPlugLevel_48 uplug_setPlugLevel_INTERNAL_API_DO_NOT_USE
+#        define uplug_setPlugName_48 uplug_setPlugName_INTERNAL_API_DO_NOT_USE
+#        define uplug_setPlugNoUnload_48 uplug_setPlugNoUnload_INTERNAL_API_DO_NOT_USE
+#        define uprv_getDefaultCodepage_48 uprv_getDefaultCodepage_INTERNAL_API_DO_NOT_USE
+#        define uprv_getDefaultLocaleID_48 uprv_getDefaultLocaleID_INTERNAL_API_DO_NOT_USE
+#        define ures_openFillIn_48 ures_openFillIn_INTERNAL_API_DO_NOT_USE
+#        define usearch_searchBackwards_48 usearch_searchBackwards_INTERNAL_API_DO_NOT_USE
+#        define usearch_search_48 usearch_search_INTERNAL_API_DO_NOT_USE
+#        define utf8_appendCharSafeBody_48 utf8_appendCharSafeBody_INTERNAL_API_DO_NOT_USE
+#        define utf8_back1SafeBody_48 utf8_back1SafeBody_INTERNAL_API_DO_NOT_USE
+#        define utf8_countTrailBytes_48 utf8_countTrailBytes_INTERNAL_API_DO_NOT_USE
+#        define utf8_nextCharSafeBody_48 utf8_nextCharSafeBody_INTERNAL_API_DO_NOT_USE
+#        define utf8_prevCharSafeBody_48 utf8_prevCharSafeBody_INTERNAL_API_DO_NOT_USE
 #    endif /* U_DISABLE_RENAMING */
 
 #endif /* U_HIDE_INTERNAL_API */

diff --git a/icu4c/source/common/unicode/usystem.h b/icu4c/source/common/unicode/usystem.h
index 8eea71ddf37cde7cc365acff5ebc2220caf064fb..17d5bf855d0ebace451ab2abf4bf7012c9a8328b 100644 (file)
--- a/icu4c/source/common/unicode/usystem.h
+++ b/icu4c/source/common/unicode/usystem.h
@@ -24,21 +24,21 @@
 #ifdef U_HIDE_SYSTEM_API
 
 #    if U_DISABLE_RENAMING
-#        define u_cleanup(void) u_cleanup(void)_SYSTEM_API_DO_NOT_USE
-#        define u_setAtomicIncDecFunctions(const void *context, UMtxAtomicFn *inc, UMtxAtomicFn *dec, UErrorCode *status) u_setAtomicIncDecFunctions(const void *context, UMtxAtomicFn *inc, UMtxAtomicFn *dec, UErrorCode *status)_SYSTEM_API_DO_NOT_USE
-#        define u_setMemoryFunctions(const void *context, UMemAllocFn *a, UMemReallocFn *r, UMemFreeFn *f, UErrorCode *status) u_setMemoryFunctions(const void *context, UMemAllocFn *a, UMemReallocFn *r, UMemFreeFn *f, UErrorCode *status)_SYSTEM_API_DO_NOT_USE
-#        define u_setMutexFunctions(const void *context, UMtxInitFn *init, UMtxFn *destroy, UMtxFn *lock, UMtxFn *unlock, UErrorCode *status) u_setMutexFunctions(const void *context, UMtxInitFn *init, UMtxFn *destroy, UMtxFn *lock, UMtxFn *unlock, UErrorCode *status)_SYSTEM_API_DO_NOT_USE
-#        define ucnv_setDefaultName(const char *name) ucnv_setDefaultName(const char *name)_SYSTEM_API_DO_NOT_USE
-#        define uloc_getDefault(void) uloc_getDefault(void)_SYSTEM_API_DO_NOT_USE
-#        define uloc_setDefault(const char *localeID, UErrorCode *status) uloc_setDefault(const char *localeID, UErrorCode *status)_SYSTEM_API_DO_NOT_USE
+#        define u_cleanup u_cleanup_SYSTEM_API_DO_NOT_USE
+#        define u_setAtomicIncDecFunctions u_setAtomicIncDecFunctions_SYSTEM_API_DO_NOT_USE
+#        define u_setMemoryFunctions u_setMemoryFunctions_SYSTEM_API_DO_NOT_USE
+#        define u_setMutexFunctions u_setMutexFunctions_SYSTEM_API_DO_NOT_USE
+#        define ucnv_setDefaultName ucnv_setDefaultName_SYSTEM_API_DO_NOT_USE
+#        define uloc_getDefault uloc_getDefault_SYSTEM_API_DO_NOT_USE
+#        define uloc_setDefault uloc_setDefault_SYSTEM_API_DO_NOT_USE
 #    else
-#        define u_cleanup(void)_4_7 u_cleanup(void)_SYSTEM_API_DO_NOT_USE
-#        define u_setAtomicIncDecFunctions(const void *context, UMtxAtomicFn *inc, UMtxAtomicFn *dec, UErrorCode *status)_4_7 u_setAtomicIncDecFunctions(const void *context, UMtxAtomicFn *inc, UMtxAtomicFn *dec, UErrorCode *status)_SYSTEM_API_DO_NOT_USE
-#        define u_setMemoryFunctions(const void *context, UMemAllocFn *a, UMemReallocFn *r, UMemFreeFn *f, UErrorCode *status)_4_7 u_setMemoryFunctions(const void *context, UMemAllocFn *a, UMemReallocFn *r, UMemFreeFn *f, UErrorCode *status)_SYSTEM_API_DO_NOT_USE
-#        define u_setMutexFunctions(const void *context, UMtxInitFn *init, UMtxFn *destroy, UMtxFn *lock, UMtxFn *unlock, UErrorCode *status)_4_7 u_setMutexFunctions(const void *context, UMtxInitFn *init, UMtxFn *destroy, UMtxFn *lock, UMtxFn *unlock, UErrorCode *status)_SYSTEM_API_DO_NOT_USE
-#        define ucnv_setDefaultName(const char *name)_4_7 ucnv_setDefaultName(const char *name)_SYSTEM_API_DO_NOT_USE
-#        define uloc_getDefault(void)_4_7 uloc_getDefault(void)_SYSTEM_API_DO_NOT_USE
-#        define uloc_setDefault(const char *localeID, UErrorCode *status)_4_7 uloc_setDefault(const char *localeID, UErrorCode *status)_SYSTEM_API_DO_NOT_USE
+#        define u_cleanup_48 u_cleanup_SYSTEM_API_DO_NOT_USE
+#        define u_setAtomicIncDecFunctions_48 u_setAtomicIncDecFunctions_SYSTEM_API_DO_NOT_USE
+#        define u_setMemoryFunctions_48 u_setMemoryFunctions_SYSTEM_API_DO_NOT_USE
+#        define u_setMutexFunctions_48 u_setMutexFunctions_SYSTEM_API_DO_NOT_USE
+#        define ucnv_setDefaultName_48 ucnv_setDefaultName_SYSTEM_API_DO_NOT_USE
+#        define uloc_getDefault_48 uloc_getDefault_SYSTEM_API_DO_NOT_USE
+#        define uloc_setDefault_48 uloc_setDefault_SYSTEM_API_DO_NOT_USE
 #    endif /* U_DISABLE_RENAMING */
 
 #endif /* U_HIDE_SYSTEM_API */

diff --git a/icu4c/source/tools/gendraft/Makefile b/icu4c/source/tools/gendraft/Makefile
index 0769492829b299d2288f1a912167e2bd7b26790f..6914b51211dc8b851999a2dbb6766f636f7eee88 100644 (file)
--- a/icu4c/source/tools/gendraft/Makefile
+++ b/icu4c/source/tools/gendraft/Makefile
@@ -1,5 +1,5 @@
 #*******************************************************************************
-#*   Copyright (C) 2008-2010, International Business Machines
+#*   Copyright (C) 2008-2011, International Business Machines
 #*   Corporation and others.  All Rights Reserved.
 #*******************************************************************************
 
@@ -16,6 +16,7 @@ LOCALHEADERS= udeprctd.h udraft.h uintrnal.h usystem.h
 COMMONHDR= $(top_srcdir)/common/unicode
 DOCDIR= $(top_builddir)/doc/html
 EXCLUDE=$(srcdir)/exclude.txt
+-include Makefile.local
 
 all:
        @echo Usage:  'make install-headers'  to update headers.
@@ -31,7 +32,7 @@ $(DOCDIR):
 local-headers: $(LOCALHEADERS)
 
 install-headers: $(DOCDIR)
-       perl ./genheaders.pl --srcdir=$(DOCDIR) --destdir=$(COMMONHDR) --version=$(VERSION) --exclusion-list=$(EXCLUDE)
+       perl ./genheaders.pl --srcdir=$(DOCDIR) --destdir=$(COMMONHDR) --version=$(VERSION) --exclusion-list=$(EXCLUDE) $(GENHEADERS_OPTS)
        ( cd $(COMMONHDR) ; ls -l $(LOCALHEADERS) )
 
 %.h:   $(COMMONHDR)/%.h

diff --git a/icu4c/source/tools/gendraft/genheaders.pl b/icu4c/source/tools/gendraft/genheaders.pl
index 00fae2dbb4c3c52e153f38f18b71a6dec94f8030..1f5f868ba21d521c85852b78ee81d97fb6aaf60c 100755 (executable)
--- a/icu4c/source/tools/gendraft/genheaders.pl
+++ b/icu4c/source/tools/gendraft/genheaders.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #*
 #*******************************************************************************
-#*   Copyright (C) 2006-2010, International Business Machines
+#*   Copyright (C) 2006-2011, International Business Machines
 #*   Corporation and others.  All Rights Reserved.
 #*******************************************************************************
 #*
@@ -73,7 +73,7 @@ sub main(){
   $internalFile   = "$srcDir/internal.html";
   
   $versionAppend = $version;
-  $versionAppend=~ s/^([0-9]+)\.([0-9]+).*/\1_\2/;
+  $versionAppend=~ s/^([0-9]+)\.([0-9]+).*/\1\2/;  # _48
   $excludeFH = IO::File->new($exclude,"r")
             or die  "could not open the file $exclude for reading: $! \n";
   my %exclude;
@@ -177,7 +177,7 @@ sub parseWriteFile{
             #<dt>Global <a class="el" href="utrans_8h.html#a21">utrans_unregister</a>  </dt>
             #<dt>Global <a class="el" href="classUnicodeString.html#w1w0">UnicodeString::kInvariant</a>  </dt>
             # the below regular expression works for both the above formats.
-            $line=~ m/\<dt\>.*\<a class=\".*\" href=\".*\">(.*)\<\/dt\>/;
+            $line=~ m/\<dt\>.*\<a class=\".*\" href=\".*\">(.*)\<\/a\>.*\<\/dt\>/;
             my $value = $1;
             $value =~ s/\<\/a\>\s*//g;
             $value =~ s/^\s+//;