From cbe3757600cc8f027587a6cc71b125cf377873a7 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Thu, 11 Mar 2010 02:25:58 +0000 Subject: [PATCH] ICU-7532 fix and update udraft.h etc headers X-SVN-Rev: 27815 --- icu4c/source/common/unicode/udeprctd.h | 22 +- icu4c/source/common/unicode/udraft.h | 160 +++++++------- icu4c/source/common/unicode/uintrnal.h | 248 +++++++++++++--------- icu4c/source/common/unicode/uobslete.h | 4 +- icu4c/source/common/unicode/usystem.h | 18 +- icu4c/source/tools/gendraft/Makefile | 12 +- icu4c/source/tools/gendraft/genheaders.pl | 19 +- 7 files changed, 272 insertions(+), 211 deletions(-) diff --git a/icu4c/source/common/unicode/udeprctd.h b/icu4c/source/common/unicode/udeprctd.h index 64271b9497..9d59fc0cb9 100644 --- a/icu4c/source/common/unicode/udeprctd.h +++ b/icu4c/source/common/unicode/udeprctd.h @@ -1,10 +1,10 @@ /* ******************************************************************************* -* Copyright (C) 2004-2009, International Business Machines +* Copyright (C) 2004-2010, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* * -* file name: +* file name: udeprctd.h * encoding: US-ASCII * tab size: 8 (not used) * indentation:4 @@ -34,15 +34,15 @@ # define utrans_open utrans_open_DEPRECATED_API_DO_NOT_USE # define utrans_unregister utrans_unregister_DEPRECATED_API_DO_NOT_USE # else -# define ucol_getContractions_4_2 ucol_getContractions_DEPRECATED_API_DO_NOT_USE -# define ucol_getLocale_4_2 ucol_getLocale_DEPRECATED_API_DO_NOT_USE -# define ures_countArrayItems_4_2 ures_countArrayItems_DEPRECATED_API_DO_NOT_USE -# define ures_getLocale_4_2 ures_getLocale_DEPRECATED_API_DO_NOT_USE -# define ures_getVersionNumber_4_2 ures_getVersionNumber_DEPRECATED_API_DO_NOT_USE -# define utrans_getAvailableID_4_2 utrans_getAvailableID_DEPRECATED_API_DO_NOT_USE -# define utrans_getID_4_2 utrans_getID_DEPRECATED_API_DO_NOT_USE -# define utrans_open_4_2 utrans_open_DEPRECATED_API_DO_NOT_USE -# define utrans_unregister_4_2 utrans_unregister_DEPRECATED_API_DO_NOT_USE +# define ucol_getContractions_4_4 ucol_getContractions_DEPRECATED_API_DO_NOT_USE +# define ucol_getLocale_4_4 ucol_getLocale_DEPRECATED_API_DO_NOT_USE +# define ures_countArrayItems_4_4 ures_countArrayItems_DEPRECATED_API_DO_NOT_USE +# define ures_getLocale_4_4 ures_getLocale_DEPRECATED_API_DO_NOT_USE +# define ures_getVersionNumber_4_4 ures_getVersionNumber_DEPRECATED_API_DO_NOT_USE +# define utrans_getAvailableID_4_4 utrans_getAvailableID_DEPRECATED_API_DO_NOT_USE +# define utrans_getID_4_4 utrans_getID_DEPRECATED_API_DO_NOT_USE +# define utrans_open_4_4 utrans_open_DEPRECATED_API_DO_NOT_USE +# define utrans_unregister_4_4 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 cef57a3605..6c05990675 100644 --- a/icu4c/source/common/unicode/udraft.h +++ b/icu4c/source/common/unicode/udraft.h @@ -1,10 +1,10 @@ /* ******************************************************************************* -* Copyright (C) 2004-2009, International Business Machines +* Copyright (C) 2004-2010, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* * -* file name: +* file name: udraft.h * encoding: US-ASCII * tab size: 8 (not used) * indentation:4 @@ -24,91 +24,83 @@ #ifdef U_HIDE_DRAFT_API # if U_DISABLE_RENAMING -# define u_compareVersions u_compareVersions_DRAFT_API_DO_NOT_USE -# define u_strFromUTF32WithSub u_strFromUTF32WithSub_DRAFT_API_DO_NOT_USE -# define u_strToUTF32WithSub u_strToUTF32WithSub_DRAFT_API_DO_NOT_USE -# define u_versionFromUString u_versionFromUString_DRAFT_API_DO_NOT_USE -# define ucal_getKeywordValuesForLocale ucal_getKeywordValuesForLocale_DRAFT_API_DO_NOT_USE -# define ucal_getType ucal_getType_DRAFT_API_DO_NOT_USE -# define ucnvsel_close ucnvsel_close_DRAFT_API_DO_NOT_USE -# define ucnvsel_open ucnvsel_open_DRAFT_API_DO_NOT_USE -# define ucnvsel_openFromSerialized ucnvsel_openFromSerialized_DRAFT_API_DO_NOT_USE -# define ucnvsel_selectForString ucnvsel_selectForString_DRAFT_API_DO_NOT_USE -# define ucnvsel_selectForUTF8 ucnvsel_selectForUTF8_DRAFT_API_DO_NOT_USE -# define ucnvsel_serialize ucnvsel_serialize_DRAFT_API_DO_NOT_USE -# define ucol_getKeywordValuesForLocale ucol_getKeywordValuesForLocale_DRAFT_API_DO_NOT_USE -# define ucurr_getKeywordValuesForLocale ucurr_getKeywordValuesForLocale_DRAFT_API_DO_NOT_USE -# define ucurr_getPluralName ucurr_getPluralName_DRAFT_API_DO_NOT_USE +# define bamuScriptCode bamuScriptCode_DRAFT_API_DO_NOT_USE +# define u_fadopt u_fadopt_DRAFT_API_DO_NOT_USE +# define u_strFromJavaModifiedUTF8WithSub u_strFromJavaModifiedUTF8WithSub_DRAFT_API_DO_NOT_USE +# define u_strToJavaModifiedUTF8 u_strToJavaModifiedUTF8_DRAFT_API_DO_NOT_USE +# define ucal_getDayOfWeekType ucal_getDayOfWeekType_DRAFT_API_DO_NOT_USE +# define ucal_getWeekendTransition ucal_getWeekendTransition_DRAFT_API_DO_NOT_USE +# define ucal_isWeekend ucal_isWeekend_DRAFT_API_DO_NOT_USE +# define udat_toCalendarDateField udat_toCalendarDateField_DRAFT_API_DO_NOT_USE +# define udatpg_getBestPatternWithOptions udatpg_getBestPatternWithOptions_DRAFT_API_DO_NOT_USE +# define udatpg_replaceFieldTypesWithOptions udatpg_replaceFieldTypesWithOptions_DRAFT_API_DO_NOT_USE +# define uldn_close uldn_close_DRAFT_API_DO_NOT_USE +# define uldn_getDialectHandling uldn_getDialectHandling_DRAFT_API_DO_NOT_USE +# define uldn_getLocale uldn_getLocale_DRAFT_API_DO_NOT_USE +# define uldn_keyDisplayName uldn_keyDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_keyValueDisplayName uldn_keyValueDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_languageDisplayName uldn_languageDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_localeDisplayName uldn_localeDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_open uldn_open_DRAFT_API_DO_NOT_USE +# define uldn_regionDisplayName uldn_regionDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_scriptCodeDisplayName uldn_scriptCodeDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_scriptDisplayName uldn_scriptDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_variantDisplayName uldn_variantDisplayName_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 ulocdata_getCLDRVersion ulocdata_getCLDRVersion_DRAFT_API_DO_NOT_USE -# define ulocdata_getLocaleDisplayPattern ulocdata_getLocaleDisplayPattern_DRAFT_API_DO_NOT_USE -# define ulocdata_getLocaleSeparator ulocdata_getLocaleSeparator_DRAFT_API_DO_NOT_USE -# define uset_closeOver uset_closeOver_DRAFT_API_DO_NOT_USE -# define uset_openEmpty uset_openEmpty_DRAFT_API_DO_NOT_USE -# define uset_removeAllStrings uset_removeAllStrings_DRAFT_API_DO_NOT_USE -# define uspoof_areConfusable uspoof_areConfusable_DRAFT_API_DO_NOT_USE -# define uspoof_areConfusableUTF8 uspoof_areConfusableUTF8_DRAFT_API_DO_NOT_USE -# define uspoof_check uspoof_check_DRAFT_API_DO_NOT_USE -# define uspoof_checkUTF8 uspoof_checkUTF8_DRAFT_API_DO_NOT_USE -# define uspoof_clone uspoof_clone_DRAFT_API_DO_NOT_USE -# define uspoof_close uspoof_close_DRAFT_API_DO_NOT_USE -# define uspoof_getAllowedChars uspoof_getAllowedChars_DRAFT_API_DO_NOT_USE -# define uspoof_getAllowedLocales uspoof_getAllowedLocales_DRAFT_API_DO_NOT_USE -# define uspoof_getChecks uspoof_getChecks_DRAFT_API_DO_NOT_USE -# define uspoof_getSkeleton uspoof_getSkeleton_DRAFT_API_DO_NOT_USE -# define uspoof_getSkeletonUTF8 uspoof_getSkeletonUTF8_DRAFT_API_DO_NOT_USE -# define uspoof_open uspoof_open_DRAFT_API_DO_NOT_USE -# define uspoof_openFromSerialized uspoof_openFromSerialized_DRAFT_API_DO_NOT_USE -# define uspoof_openFromSource uspoof_openFromSource_DRAFT_API_DO_NOT_USE -# define uspoof_serialize uspoof_serialize_DRAFT_API_DO_NOT_USE -# define uspoof_setAllowedChars uspoof_setAllowedChars_DRAFT_API_DO_NOT_USE -# define uspoof_setAllowedLocales uspoof_setAllowedLocales_DRAFT_API_DO_NOT_USE -# define uspoof_setChecks uspoof_setChecks_DRAFT_API_DO_NOT_USE -# define usprep_openByType usprep_openByType_DRAFT_API_DO_NOT_USE +# define unorm2_append unorm2_append_DRAFT_API_DO_NOT_USE +# define unorm2_close unorm2_close_DRAFT_API_DO_NOT_USE +# define unorm2_getInstance unorm2_getInstance_DRAFT_API_DO_NOT_USE +# define unorm2_hasBoundaryAfter unorm2_hasBoundaryAfter_DRAFT_API_DO_NOT_USE +# define unorm2_hasBoundaryBefore unorm2_hasBoundaryBefore_DRAFT_API_DO_NOT_USE +# define unorm2_isInert unorm2_isInert_DRAFT_API_DO_NOT_USE +# define unorm2_isNormalized unorm2_isNormalized_DRAFT_API_DO_NOT_USE +# define unorm2_normalize unorm2_normalize_DRAFT_API_DO_NOT_USE +# define unorm2_normalizeSecondAndAppend unorm2_normalizeSecondAndAppend_DRAFT_API_DO_NOT_USE +# define unorm2_openFiltered unorm2_openFiltered_DRAFT_API_DO_NOT_USE +# define unorm2_quickCheck unorm2_quickCheck_DRAFT_API_DO_NOT_USE +# define unorm2_spanQuickCheckYes unorm2_spanQuickCheckYes_DRAFT_API_DO_NOT_USE +# define unum_formatDecimal unum_formatDecimal_DRAFT_API_DO_NOT_USE +# define unum_parseDecimal unum_parseDecimal_DRAFT_API_DO_NOT_USE # else -# define u_compareVersions_4_2 u_compareVersions_DRAFT_API_DO_NOT_USE -# define u_strFromUTF32WithSub_4_2 u_strFromUTF32WithSub_DRAFT_API_DO_NOT_USE -# define u_strToUTF32WithSub_4_2 u_strToUTF32WithSub_DRAFT_API_DO_NOT_USE -# define u_versionFromUString_4_2 u_versionFromUString_DRAFT_API_DO_NOT_USE -# define ucal_getKeywordValuesForLocale_4_2 ucal_getKeywordValuesForLocale_DRAFT_API_DO_NOT_USE -# define ucal_getType_4_2 ucal_getType_DRAFT_API_DO_NOT_USE -# define ucnvsel_close_4_2 ucnvsel_close_DRAFT_API_DO_NOT_USE -# define ucnvsel_openFromSerialized_4_2 ucnvsel_openFromSerialized_DRAFT_API_DO_NOT_USE -# define ucnvsel_open_4_2 ucnvsel_open_DRAFT_API_DO_NOT_USE -# define ucnvsel_selectForString_4_2 ucnvsel_selectForString_DRAFT_API_DO_NOT_USE -# define ucnvsel_selectForUTF8_4_2 ucnvsel_selectForUTF8_DRAFT_API_DO_NOT_USE -# define ucnvsel_serialize_4_2 ucnvsel_serialize_DRAFT_API_DO_NOT_USE -# define ucol_getKeywordValuesForLocale_4_2 ucol_getKeywordValuesForLocale_DRAFT_API_DO_NOT_USE -# define ucurr_getKeywordValuesForLocale_4_2 ucurr_getKeywordValuesForLocale_DRAFT_API_DO_NOT_USE -# define ucurr_getPluralName_4_2 ucurr_getPluralName_DRAFT_API_DO_NOT_USE -# define uloc_forLanguageTag_4_2 uloc_forLanguageTag_DRAFT_API_DO_NOT_USE -# define uloc_toLanguageTag_4_2 uloc_toLanguageTag_DRAFT_API_DO_NOT_USE -# define ulocdata_getCLDRVersion_4_2 ulocdata_getCLDRVersion_DRAFT_API_DO_NOT_USE -# define ulocdata_getLocaleDisplayPattern_4_2 ulocdata_getLocaleDisplayPattern_DRAFT_API_DO_NOT_USE -# define ulocdata_getLocaleSeparator_4_2 ulocdata_getLocaleSeparator_DRAFT_API_DO_NOT_USE -# define uset_closeOver_4_2 uset_closeOver_DRAFT_API_DO_NOT_USE -# define uset_openEmpty_4_2 uset_openEmpty_DRAFT_API_DO_NOT_USE -# define uset_removeAllStrings_4_2 uset_removeAllStrings_DRAFT_API_DO_NOT_USE -# define uspoof_areConfusableUTF8_4_2 uspoof_areConfusableUTF8_DRAFT_API_DO_NOT_USE -# define uspoof_areConfusable_4_2 uspoof_areConfusable_DRAFT_API_DO_NOT_USE -# define uspoof_checkUTF8_4_2 uspoof_checkUTF8_DRAFT_API_DO_NOT_USE -# define uspoof_check_4_2 uspoof_check_DRAFT_API_DO_NOT_USE -# define uspoof_clone_4_2 uspoof_clone_DRAFT_API_DO_NOT_USE -# define uspoof_close_4_2 uspoof_close_DRAFT_API_DO_NOT_USE -# define uspoof_getAllowedChars_4_2 uspoof_getAllowedChars_DRAFT_API_DO_NOT_USE -# define uspoof_getAllowedLocales_4_2 uspoof_getAllowedLocales_DRAFT_API_DO_NOT_USE -# define uspoof_getChecks_4_2 uspoof_getChecks_DRAFT_API_DO_NOT_USE -# define uspoof_getSkeletonUTF8_4_2 uspoof_getSkeletonUTF8_DRAFT_API_DO_NOT_USE -# define uspoof_getSkeleton_4_2 uspoof_getSkeleton_DRAFT_API_DO_NOT_USE -# define uspoof_openFromSerialized_4_2 uspoof_openFromSerialized_DRAFT_API_DO_NOT_USE -# define uspoof_openFromSource_4_2 uspoof_openFromSource_DRAFT_API_DO_NOT_USE -# define uspoof_open_4_2 uspoof_open_DRAFT_API_DO_NOT_USE -# define uspoof_serialize_4_2 uspoof_serialize_DRAFT_API_DO_NOT_USE -# define uspoof_setAllowedChars_4_2 uspoof_setAllowedChars_DRAFT_API_DO_NOT_USE -# define uspoof_setAllowedLocales_4_2 uspoof_setAllowedLocales_DRAFT_API_DO_NOT_USE -# define uspoof_setChecks_4_2 uspoof_setChecks_DRAFT_API_DO_NOT_USE -# define usprep_openByType_4_2 usprep_openByType_DRAFT_API_DO_NOT_USE +# define bamuScriptCode_4_4 bamuScriptCode_DRAFT_API_DO_NOT_USE +# define u_fadopt_4_4 u_fadopt_DRAFT_API_DO_NOT_USE +# define u_strFromJavaModifiedUTF8WithSub_4_4 u_strFromJavaModifiedUTF8WithSub_DRAFT_API_DO_NOT_USE +# define u_strToJavaModifiedUTF8_4_4 u_strToJavaModifiedUTF8_DRAFT_API_DO_NOT_USE +# define ucal_getDayOfWeekType_4_4 ucal_getDayOfWeekType_DRAFT_API_DO_NOT_USE +# define ucal_getWeekendTransition_4_4 ucal_getWeekendTransition_DRAFT_API_DO_NOT_USE +# define ucal_isWeekend_4_4 ucal_isWeekend_DRAFT_API_DO_NOT_USE +# define udat_toCalendarDateField_4_4 udat_toCalendarDateField_DRAFT_API_DO_NOT_USE +# define udatpg_getBestPatternWithOptions_4_4 udatpg_getBestPatternWithOptions_DRAFT_API_DO_NOT_USE +# define udatpg_replaceFieldTypesWithOptions_4_4 udatpg_replaceFieldTypesWithOptions_DRAFT_API_DO_NOT_USE +# define uldn_close_4_4 uldn_close_DRAFT_API_DO_NOT_USE +# define uldn_getDialectHandling_4_4 uldn_getDialectHandling_DRAFT_API_DO_NOT_USE +# define uldn_getLocale_4_4 uldn_getLocale_DRAFT_API_DO_NOT_USE +# define uldn_keyDisplayName_4_4 uldn_keyDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_keyValueDisplayName_4_4 uldn_keyValueDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_languageDisplayName_4_4 uldn_languageDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_localeDisplayName_4_4 uldn_localeDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_open_4_4 uldn_open_DRAFT_API_DO_NOT_USE +# define uldn_regionDisplayName_4_4 uldn_regionDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_scriptCodeDisplayName_4_4 uldn_scriptCodeDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_scriptDisplayName_4_4 uldn_scriptDisplayName_DRAFT_API_DO_NOT_USE +# define uldn_variantDisplayName_4_4 uldn_variantDisplayName_DRAFT_API_DO_NOT_USE +# define uloc_forLanguageTag_4_4 uloc_forLanguageTag_DRAFT_API_DO_NOT_USE +# define uloc_toLanguageTag_4_4 uloc_toLanguageTag_DRAFT_API_DO_NOT_USE +# define unorm2_append_4_4 unorm2_append_DRAFT_API_DO_NOT_USE +# define unorm2_close_4_4 unorm2_close_DRAFT_API_DO_NOT_USE +# define unorm2_getInstance_4_4 unorm2_getInstance_DRAFT_API_DO_NOT_USE +# define unorm2_hasBoundaryAfter_4_4 unorm2_hasBoundaryAfter_DRAFT_API_DO_NOT_USE +# define unorm2_hasBoundaryBefore_4_4 unorm2_hasBoundaryBefore_DRAFT_API_DO_NOT_USE +# define unorm2_isInert_4_4 unorm2_isInert_DRAFT_API_DO_NOT_USE +# define unorm2_isNormalized_4_4 unorm2_isNormalized_DRAFT_API_DO_NOT_USE +# define unorm2_normalizeSecondAndAppend_4_4 unorm2_normalizeSecondAndAppend_DRAFT_API_DO_NOT_USE +# define unorm2_normalize_4_4 unorm2_normalize_DRAFT_API_DO_NOT_USE +# define unorm2_openFiltered_4_4 unorm2_openFiltered_DRAFT_API_DO_NOT_USE +# define unorm2_quickCheck_4_4 unorm2_quickCheck_DRAFT_API_DO_NOT_USE +# define unorm2_spanQuickCheckYes_4_4 unorm2_spanQuickCheckYes_DRAFT_API_DO_NOT_USE +# define unum_formatDecimal_4_4 unum_formatDecimal_DRAFT_API_DO_NOT_USE +# define unum_parseDecimal_4_4 unum_parseDecimal_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 6376960869..48e6dda7cf 100644 --- a/icu4c/source/common/unicode/uintrnal.h +++ b/icu4c/source/common/unicode/uintrnal.h @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 2004-2009, International Business Machines +* Copyright (C) 2004-2010, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* * @@ -25,14 +25,12 @@ # if U_DISABLE_RENAMING # 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 decimfmtAffixPatternValueComparator decimfmtAffixPatternValueComparator_INTERNAL_API_DO_NOT_USE -# define decimfmtAffixValueComparator decimfmtAffixValueComparator_INTERNAL_API_DO_NOT_USE -# define dtitvinfHashTableValueComparator dtitvinfHashTableValueComparator_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 @@ -105,108 +103,168 @@ # 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 uregex_appendReplacementUText uregex_appendReplacementUText_INTERNAL_API_DO_NOT_USE +# define uregex_appendTailUText uregex_appendTailUText_INTERNAL_API_DO_NOT_USE +# define uregex_getUText uregex_getUText_INTERNAL_API_DO_NOT_USE +# define uregex_groupUText uregex_groupUText_INTERNAL_API_DO_NOT_USE +# define uregex_openUText uregex_openUText_INTERNAL_API_DO_NOT_USE +# define uregex_patternUText uregex_patternUText_INTERNAL_API_DO_NOT_USE +# define uregex_replaceAllUText uregex_replaceAllUText_INTERNAL_API_DO_NOT_USE +# define uregex_replaceFirstUText uregex_replaceFirstUText_INTERNAL_API_DO_NOT_USE +# define uregex_setUText uregex_setUText_INTERNAL_API_DO_NOT_USE +# define uregex_splitUText uregex_splitUText_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 utext_caseCompare utext_caseCompare_INTERNAL_API_DO_NOT_USE +# define utext_caseCompareNativeLimit utext_caseCompareNativeLimit_INTERNAL_API_DO_NOT_USE +# define utext_compare utext_compare_INTERNAL_API_DO_NOT_USE +# define utext_compareNativeLimit utext_compareNativeLimit_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 RegexPatternDump_4_2 RegexPatternDump_INTERNAL_API_DO_NOT_USE -# define bms_empty_4_2 bms_empty_INTERNAL_API_DO_NOT_USE -# define bms_getData_4_2 bms_getData_INTERNAL_API_DO_NOT_USE -# define bms_open_4_2 bms_open_INTERNAL_API_DO_NOT_USE -# define bms_search_4_2 bms_search_INTERNAL_API_DO_NOT_USE -# define bms_setTargetString_4_2 bms_setTargetString_INTERNAL_API_DO_NOT_USE -# define decimfmtAffixPatternValueComparator_4_2 decimfmtAffixPatternValueComparator_INTERNAL_API_DO_NOT_USE -# define decimfmtAffixValueComparator_4_2 decimfmtAffixValueComparator_INTERNAL_API_DO_NOT_USE -# define dtitvinfHashTableValueComparator_4_2 dtitvinfHashTableValueComparator_INTERNAL_API_DO_NOT_USE -# define pl_addFontRun_4_2 pl_addFontRun_INTERNAL_API_DO_NOT_USE -# define pl_addLocaleRun_4_2 pl_addLocaleRun_INTERNAL_API_DO_NOT_USE -# define pl_addValueRun_4_2 pl_addValueRun_INTERNAL_API_DO_NOT_USE -# define pl_closeFontRuns_4_2 pl_closeFontRuns_INTERNAL_API_DO_NOT_USE -# define pl_closeLine_4_2 pl_closeLine_INTERNAL_API_DO_NOT_USE -# define pl_closeLocaleRuns_4_2 pl_closeLocaleRuns_INTERNAL_API_DO_NOT_USE -# define pl_closeValueRuns_4_2 pl_closeValueRuns_INTERNAL_API_DO_NOT_USE -# define pl_close_4_2 pl_close_INTERNAL_API_DO_NOT_USE -# define pl_countLineRuns_4_2 pl_countLineRuns_INTERNAL_API_DO_NOT_USE -# define pl_create_4_2 pl_create_INTERNAL_API_DO_NOT_USE -# define pl_getAscent_4_2 pl_getAscent_INTERNAL_API_DO_NOT_USE -# define pl_getDescent_4_2 pl_getDescent_INTERNAL_API_DO_NOT_USE -# define pl_getFontRunCount_4_2 pl_getFontRunCount_INTERNAL_API_DO_NOT_USE -# define pl_getFontRunFont_4_2 pl_getFontRunFont_INTERNAL_API_DO_NOT_USE -# define pl_getFontRunLastLimit_4_2 pl_getFontRunLastLimit_INTERNAL_API_DO_NOT_USE -# define pl_getFontRunLimit_4_2 pl_getFontRunLimit_INTERNAL_API_DO_NOT_USE -# define pl_getLeading_4_2 pl_getLeading_INTERNAL_API_DO_NOT_USE -# define pl_getLineAscent_4_2 pl_getLineAscent_INTERNAL_API_DO_NOT_USE -# define pl_getLineDescent_4_2 pl_getLineDescent_INTERNAL_API_DO_NOT_USE -# define pl_getLineLeading_4_2 pl_getLineLeading_INTERNAL_API_DO_NOT_USE -# define pl_getLineVisualRun_4_2 pl_getLineVisualRun_INTERNAL_API_DO_NOT_USE -# define pl_getLineWidth_4_2 pl_getLineWidth_INTERNAL_API_DO_NOT_USE -# define pl_getLocaleRunCount_4_2 pl_getLocaleRunCount_INTERNAL_API_DO_NOT_USE -# define pl_getLocaleRunLastLimit_4_2 pl_getLocaleRunLastLimit_INTERNAL_API_DO_NOT_USE -# define pl_getLocaleRunLimit_4_2 pl_getLocaleRunLimit_INTERNAL_API_DO_NOT_USE -# define pl_getLocaleRunLocale_4_2 pl_getLocaleRunLocale_INTERNAL_API_DO_NOT_USE -# define pl_getParagraphLevel_4_2 pl_getParagraphLevel_INTERNAL_API_DO_NOT_USE -# define pl_getTextDirection_4_2 pl_getTextDirection_INTERNAL_API_DO_NOT_USE -# define pl_getValueRunCount_4_2 pl_getValueRunCount_INTERNAL_API_DO_NOT_USE -# define pl_getValueRunLastLimit_4_2 pl_getValueRunLastLimit_INTERNAL_API_DO_NOT_USE -# define pl_getValueRunLimit_4_2 pl_getValueRunLimit_INTERNAL_API_DO_NOT_USE -# define pl_getValueRunValue_4_2 pl_getValueRunValue_INTERNAL_API_DO_NOT_USE -# define pl_getVisualRunAscent_4_2 pl_getVisualRunAscent_INTERNAL_API_DO_NOT_USE -# define pl_getVisualRunDescent_4_2 pl_getVisualRunDescent_INTERNAL_API_DO_NOT_USE -# define pl_getVisualRunDirection_4_2 pl_getVisualRunDirection_INTERNAL_API_DO_NOT_USE -# define pl_getVisualRunFont_4_2 pl_getVisualRunFont_INTERNAL_API_DO_NOT_USE -# define pl_getVisualRunGlyphCount_4_2 pl_getVisualRunGlyphCount_INTERNAL_API_DO_NOT_USE -# define pl_getVisualRunGlyphToCharMap_4_2 pl_getVisualRunGlyphToCharMap_INTERNAL_API_DO_NOT_USE -# define pl_getVisualRunGlyphs_4_2 pl_getVisualRunGlyphs_INTERNAL_API_DO_NOT_USE -# define pl_getVisualRunLeading_4_2 pl_getVisualRunLeading_INTERNAL_API_DO_NOT_USE -# define pl_getVisualRunPositions_4_2 pl_getVisualRunPositions_INTERNAL_API_DO_NOT_USE -# define pl_isComplex_4_2 pl_isComplex_INTERNAL_API_DO_NOT_USE -# define pl_line_4_2 pl_line_INTERNAL_API_DO_NOT_USE -# define pl_nextLine_4_2 pl_nextLine_INTERNAL_API_DO_NOT_USE -# define pl_openEmptyFontRuns_4_2 pl_openEmptyFontRuns_INTERNAL_API_DO_NOT_USE -# define pl_openEmptyLocaleRuns_4_2 pl_openEmptyLocaleRuns_INTERNAL_API_DO_NOT_USE -# define pl_openEmptyValueRuns_4_2 pl_openEmptyValueRuns_INTERNAL_API_DO_NOT_USE -# define pl_openFontRuns_4_2 pl_openFontRuns_INTERNAL_API_DO_NOT_USE -# define pl_openLocaleRuns_4_2 pl_openLocaleRuns_INTERNAL_API_DO_NOT_USE -# define pl_openValueRuns_4_2 pl_openValueRuns_INTERNAL_API_DO_NOT_USE -# define pl_paragraph_4_2 pl_paragraph_INTERNAL_API_DO_NOT_USE -# define pl_reflow_4_2 pl_reflow_INTERNAL_API_DO_NOT_USE -# define pl_resetFontRuns_4_2 pl_resetFontRuns_INTERNAL_API_DO_NOT_USE -# define pl_resetLocaleRuns_4_2 pl_resetLocaleRuns_INTERNAL_API_DO_NOT_USE -# define pl_resetValueRuns_4_2 pl_resetValueRuns_INTERNAL_API_DO_NOT_USE -# define pl_visualRun_4_2 pl_visualRun_INTERNAL_API_DO_NOT_USE -# define ucd_close_4_2 ucd_close_INTERNAL_API_DO_NOT_USE -# define ucd_flushCache_4_2 ucd_flushCache_INTERNAL_API_DO_NOT_USE -# define ucd_freeCache_4_2 ucd_freeCache_INTERNAL_API_DO_NOT_USE -# define ucd_getCollator_4_2 ucd_getCollator_INTERNAL_API_DO_NOT_USE -# define ucd_open_4_2 ucd_open_INTERNAL_API_DO_NOT_USE -# define ucol_equals_4_2 ucol_equals_INTERNAL_API_DO_NOT_USE -# define ucol_forceHanImplicit_4_2 ucol_forceHanImplicit_INTERNAL_API_DO_NOT_USE -# define ucol_forgetUCA_4_2 ucol_forgetUCA_INTERNAL_API_DO_NOT_USE -# define ucol_getAttributeOrDefault_4_2 ucol_getAttributeOrDefault_INTERNAL_API_DO_NOT_USE -# define ucol_getUnsafeSet_4_2 ucol_getUnsafeSet_INTERNAL_API_DO_NOT_USE -# define ucol_nextProcessed_4_2 ucol_nextProcessed_INTERNAL_API_DO_NOT_USE -# define ucol_prepareShortStringOpen_4_2 ucol_prepareShortStringOpen_INTERNAL_API_DO_NOT_USE -# define ucol_previousProcessed_4_2 ucol_previousProcessed_INTERNAL_API_DO_NOT_USE -# define udat_applyPatternRelative_4_2 udat_applyPatternRelative_INTERNAL_API_DO_NOT_USE -# define udat_toPatternRelativeDate_4_2 udat_toPatternRelativeDate_INTERNAL_API_DO_NOT_USE -# define udat_toPatternRelativeTime_4_2 udat_toPatternRelativeTime_INTERNAL_API_DO_NOT_USE -# define uprv_getDefaultCodepage_4_2 uprv_getDefaultCodepage_INTERNAL_API_DO_NOT_USE -# define uprv_getDefaultLocaleID_4_2 uprv_getDefaultLocaleID_INTERNAL_API_DO_NOT_USE -# define ures_openFillIn_4_2 ures_openFillIn_INTERNAL_API_DO_NOT_USE -# define usearch_searchBackwards_4_2 usearch_searchBackwards_INTERNAL_API_DO_NOT_USE -# define usearch_search_4_2 usearch_search_INTERNAL_API_DO_NOT_USE -# define utf8_appendCharSafeBody_4_2 utf8_appendCharSafeBody_INTERNAL_API_DO_NOT_USE -# define utf8_back1SafeBody_4_2 utf8_back1SafeBody_INTERNAL_API_DO_NOT_USE -# define utf8_countTrailBytes_4_2 utf8_countTrailBytes_INTERNAL_API_DO_NOT_USE -# define utf8_nextCharSafeBody_4_2 utf8_nextCharSafeBody_INTERNAL_API_DO_NOT_USE -# define utf8_prevCharSafeBody_4_2 utf8_prevCharSafeBody_INTERNAL_API_DO_NOT_USE +# define RegexPatternDump_4_4 RegexPatternDump_INTERNAL_API_DO_NOT_USE +# define bms_close_4_4 bms_close_INTERNAL_API_DO_NOT_USE +# define bms_empty_4_4 bms_empty_INTERNAL_API_DO_NOT_USE +# define bms_getData_4_4 bms_getData_INTERNAL_API_DO_NOT_USE +# define bms_open_4_4 bms_open_INTERNAL_API_DO_NOT_USE +# define bms_search_4_4 bms_search_INTERNAL_API_DO_NOT_USE +# define bms_setTargetString_4_4 bms_setTargetString_INTERNAL_API_DO_NOT_USE +# define pl_addFontRun_4_4 pl_addFontRun_INTERNAL_API_DO_NOT_USE +# define pl_addLocaleRun_4_4 pl_addLocaleRun_INTERNAL_API_DO_NOT_USE +# define pl_addValueRun_4_4 pl_addValueRun_INTERNAL_API_DO_NOT_USE +# define pl_closeFontRuns_4_4 pl_closeFontRuns_INTERNAL_API_DO_NOT_USE +# define pl_closeLine_4_4 pl_closeLine_INTERNAL_API_DO_NOT_USE +# define pl_closeLocaleRuns_4_4 pl_closeLocaleRuns_INTERNAL_API_DO_NOT_USE +# define pl_closeValueRuns_4_4 pl_closeValueRuns_INTERNAL_API_DO_NOT_USE +# define pl_close_4_4 pl_close_INTERNAL_API_DO_NOT_USE +# define pl_countLineRuns_4_4 pl_countLineRuns_INTERNAL_API_DO_NOT_USE +# define pl_create_4_4 pl_create_INTERNAL_API_DO_NOT_USE +# define pl_getAscent_4_4 pl_getAscent_INTERNAL_API_DO_NOT_USE +# define pl_getDescent_4_4 pl_getDescent_INTERNAL_API_DO_NOT_USE +# define pl_getFontRunCount_4_4 pl_getFontRunCount_INTERNAL_API_DO_NOT_USE +# define pl_getFontRunFont_4_4 pl_getFontRunFont_INTERNAL_API_DO_NOT_USE +# define pl_getFontRunLastLimit_4_4 pl_getFontRunLastLimit_INTERNAL_API_DO_NOT_USE +# define pl_getFontRunLimit_4_4 pl_getFontRunLimit_INTERNAL_API_DO_NOT_USE +# define pl_getLeading_4_4 pl_getLeading_INTERNAL_API_DO_NOT_USE +# define pl_getLineAscent_4_4 pl_getLineAscent_INTERNAL_API_DO_NOT_USE +# define pl_getLineDescent_4_4 pl_getLineDescent_INTERNAL_API_DO_NOT_USE +# define pl_getLineLeading_4_4 pl_getLineLeading_INTERNAL_API_DO_NOT_USE +# define pl_getLineVisualRun_4_4 pl_getLineVisualRun_INTERNAL_API_DO_NOT_USE +# define pl_getLineWidth_4_4 pl_getLineWidth_INTERNAL_API_DO_NOT_USE +# define pl_getLocaleRunCount_4_4 pl_getLocaleRunCount_INTERNAL_API_DO_NOT_USE +# define pl_getLocaleRunLastLimit_4_4 pl_getLocaleRunLastLimit_INTERNAL_API_DO_NOT_USE +# define pl_getLocaleRunLimit_4_4 pl_getLocaleRunLimit_INTERNAL_API_DO_NOT_USE +# define pl_getLocaleRunLocale_4_4 pl_getLocaleRunLocale_INTERNAL_API_DO_NOT_USE +# define pl_getParagraphLevel_4_4 pl_getParagraphLevel_INTERNAL_API_DO_NOT_USE +# define pl_getTextDirection_4_4 pl_getTextDirection_INTERNAL_API_DO_NOT_USE +# define pl_getValueRunCount_4_4 pl_getValueRunCount_INTERNAL_API_DO_NOT_USE +# define pl_getValueRunLastLimit_4_4 pl_getValueRunLastLimit_INTERNAL_API_DO_NOT_USE +# define pl_getValueRunLimit_4_4 pl_getValueRunLimit_INTERNAL_API_DO_NOT_USE +# define pl_getValueRunValue_4_4 pl_getValueRunValue_INTERNAL_API_DO_NOT_USE +# define pl_getVisualRunAscent_4_4 pl_getVisualRunAscent_INTERNAL_API_DO_NOT_USE +# define pl_getVisualRunDescent_4_4 pl_getVisualRunDescent_INTERNAL_API_DO_NOT_USE +# define pl_getVisualRunDirection_4_4 pl_getVisualRunDirection_INTERNAL_API_DO_NOT_USE +# define pl_getVisualRunFont_4_4 pl_getVisualRunFont_INTERNAL_API_DO_NOT_USE +# define pl_getVisualRunGlyphCount_4_4 pl_getVisualRunGlyphCount_INTERNAL_API_DO_NOT_USE +# define pl_getVisualRunGlyphToCharMap_4_4 pl_getVisualRunGlyphToCharMap_INTERNAL_API_DO_NOT_USE +# define pl_getVisualRunGlyphs_4_4 pl_getVisualRunGlyphs_INTERNAL_API_DO_NOT_USE +# define pl_getVisualRunLeading_4_4 pl_getVisualRunLeading_INTERNAL_API_DO_NOT_USE +# define pl_getVisualRunPositions_4_4 pl_getVisualRunPositions_INTERNAL_API_DO_NOT_USE +# define pl_isComplex_4_4 pl_isComplex_INTERNAL_API_DO_NOT_USE +# define pl_line_4_4 pl_line_INTERNAL_API_DO_NOT_USE +# define pl_nextLine_4_4 pl_nextLine_INTERNAL_API_DO_NOT_USE +# define pl_openEmptyFontRuns_4_4 pl_openEmptyFontRuns_INTERNAL_API_DO_NOT_USE +# define pl_openEmptyLocaleRuns_4_4 pl_openEmptyLocaleRuns_INTERNAL_API_DO_NOT_USE +# define pl_openEmptyValueRuns_4_4 pl_openEmptyValueRuns_INTERNAL_API_DO_NOT_USE +# define pl_openFontRuns_4_4 pl_openFontRuns_INTERNAL_API_DO_NOT_USE +# define pl_openLocaleRuns_4_4 pl_openLocaleRuns_INTERNAL_API_DO_NOT_USE +# define pl_openValueRuns_4_4 pl_openValueRuns_INTERNAL_API_DO_NOT_USE +# define pl_paragraph_4_4 pl_paragraph_INTERNAL_API_DO_NOT_USE +# define pl_reflow_4_4 pl_reflow_INTERNAL_API_DO_NOT_USE +# define pl_resetFontRuns_4_4 pl_resetFontRuns_INTERNAL_API_DO_NOT_USE +# define pl_resetLocaleRuns_4_4 pl_resetLocaleRuns_INTERNAL_API_DO_NOT_USE +# define pl_resetValueRuns_4_4 pl_resetValueRuns_INTERNAL_API_DO_NOT_USE +# define pl_visualRun_4_4 pl_visualRun_INTERNAL_API_DO_NOT_USE +# define ucd_close_4_4 ucd_close_INTERNAL_API_DO_NOT_USE +# define ucd_flushCache_4_4 ucd_flushCache_INTERNAL_API_DO_NOT_USE +# define ucd_freeCache_4_4 ucd_freeCache_INTERNAL_API_DO_NOT_USE +# define ucd_getCollator_4_4 ucd_getCollator_INTERNAL_API_DO_NOT_USE +# define ucd_open_4_4 ucd_open_INTERNAL_API_DO_NOT_USE +# define ucol_equals_4_4 ucol_equals_INTERNAL_API_DO_NOT_USE +# define ucol_forceHanImplicit_4_4 ucol_forceHanImplicit_INTERNAL_API_DO_NOT_USE +# define ucol_forgetUCA_4_4 ucol_forgetUCA_INTERNAL_API_DO_NOT_USE +# define ucol_getAttributeOrDefault_4_4 ucol_getAttributeOrDefault_INTERNAL_API_DO_NOT_USE +# define ucol_getUnsafeSet_4_4 ucol_getUnsafeSet_INTERNAL_API_DO_NOT_USE +# define ucol_nextProcessed_4_4 ucol_nextProcessed_INTERNAL_API_DO_NOT_USE +# define ucol_prepareShortStringOpen_4_4 ucol_prepareShortStringOpen_INTERNAL_API_DO_NOT_USE +# define ucol_previousProcessed_4_4 ucol_previousProcessed_INTERNAL_API_DO_NOT_USE +# define udat_applyPatternRelative_4_4 udat_applyPatternRelative_INTERNAL_API_DO_NOT_USE +# define udat_toPatternRelativeDate_4_4 udat_toPatternRelativeDate_INTERNAL_API_DO_NOT_USE +# define udat_toPatternRelativeTime_4_4 udat_toPatternRelativeTime_INTERNAL_API_DO_NOT_USE +# define uplug_getConfiguration_4_4 uplug_getConfiguration_INTERNAL_API_DO_NOT_USE +# define uplug_getContext_4_4 uplug_getContext_INTERNAL_API_DO_NOT_USE +# define uplug_getCurrentLevel_4_4 uplug_getCurrentLevel_INTERNAL_API_DO_NOT_USE +# define uplug_getLibraryName_4_4 uplug_getLibraryName_INTERNAL_API_DO_NOT_USE +# define uplug_getLibrary_4_4 uplug_getLibrary_INTERNAL_API_DO_NOT_USE +# define uplug_getPlugLevel_4_4 uplug_getPlugLevel_INTERNAL_API_DO_NOT_USE +# define uplug_getPlugLoadStatus_4_4 uplug_getPlugLoadStatus_INTERNAL_API_DO_NOT_USE +# define uplug_getPlugName_4_4 uplug_getPlugName_INTERNAL_API_DO_NOT_USE +# define uplug_getSymbolName_4_4 uplug_getSymbolName_INTERNAL_API_DO_NOT_USE +# define uplug_loadPlugFromEntrypoint_4_4 uplug_loadPlugFromEntrypoint_INTERNAL_API_DO_NOT_USE +# define uplug_loadPlugFromLibrary_4_4 uplug_loadPlugFromLibrary_INTERNAL_API_DO_NOT_USE +# define uplug_nextPlug_4_4 uplug_nextPlug_INTERNAL_API_DO_NOT_USE +# define uplug_removePlug_4_4 uplug_removePlug_INTERNAL_API_DO_NOT_USE +# define uplug_setContext_4_4 uplug_setContext_INTERNAL_API_DO_NOT_USE +# define uplug_setPlugLevel_4_4 uplug_setPlugLevel_INTERNAL_API_DO_NOT_USE +# define uplug_setPlugName_4_4 uplug_setPlugName_INTERNAL_API_DO_NOT_USE +# define uplug_setPlugNoUnload_4_4 uplug_setPlugNoUnload_INTERNAL_API_DO_NOT_USE +# define uprv_getDefaultCodepage_4_4 uprv_getDefaultCodepage_INTERNAL_API_DO_NOT_USE +# define uprv_getDefaultLocaleID_4_4 uprv_getDefaultLocaleID_INTERNAL_API_DO_NOT_USE +# define uregex_appendReplacementUText_4_4 uregex_appendReplacementUText_INTERNAL_API_DO_NOT_USE +# define uregex_appendTailUText_4_4 uregex_appendTailUText_INTERNAL_API_DO_NOT_USE +# define uregex_getUText_4_4 uregex_getUText_INTERNAL_API_DO_NOT_USE +# define uregex_groupUText_4_4 uregex_groupUText_INTERNAL_API_DO_NOT_USE +# define uregex_openUText_4_4 uregex_openUText_INTERNAL_API_DO_NOT_USE +# define uregex_patternUText_4_4 uregex_patternUText_INTERNAL_API_DO_NOT_USE +# define uregex_replaceAllUText_4_4 uregex_replaceAllUText_INTERNAL_API_DO_NOT_USE +# define uregex_replaceFirstUText_4_4 uregex_replaceFirstUText_INTERNAL_API_DO_NOT_USE +# define uregex_setUText_4_4 uregex_setUText_INTERNAL_API_DO_NOT_USE +# define uregex_splitUText_4_4 uregex_splitUText_INTERNAL_API_DO_NOT_USE +# define ures_openFillIn_4_4 ures_openFillIn_INTERNAL_API_DO_NOT_USE +# define usearch_searchBackwards_4_4 usearch_searchBackwards_INTERNAL_API_DO_NOT_USE +# define usearch_search_4_4 usearch_search_INTERNAL_API_DO_NOT_USE +# define utext_caseCompareNativeLimit_4_4 utext_caseCompareNativeLimit_INTERNAL_API_DO_NOT_USE +# define utext_caseCompare_4_4 utext_caseCompare_INTERNAL_API_DO_NOT_USE +# define utext_compareNativeLimit_4_4 utext_compareNativeLimit_INTERNAL_API_DO_NOT_USE +# define utext_compare_4_4 utext_compare_INTERNAL_API_DO_NOT_USE +# define utf8_appendCharSafeBody_4_4 utf8_appendCharSafeBody_INTERNAL_API_DO_NOT_USE +# define utf8_back1SafeBody_4_4 utf8_back1SafeBody_INTERNAL_API_DO_NOT_USE +# define utf8_countTrailBytes_4_4 utf8_countTrailBytes_INTERNAL_API_DO_NOT_USE +# define utf8_nextCharSafeBody_4_4 utf8_nextCharSafeBody_INTERNAL_API_DO_NOT_USE +# define utf8_prevCharSafeBody_4_4 utf8_prevCharSafeBody_INTERNAL_API_DO_NOT_USE # endif /* U_DISABLE_RENAMING */ #endif /* U_HIDE_INTERNAL_API */ diff --git a/icu4c/source/common/unicode/uobslete.h b/icu4c/source/common/unicode/uobslete.h index ebca55e042..1ef6e855e6 100644 --- a/icu4c/source/common/unicode/uobslete.h +++ b/icu4c/source/common/unicode/uobslete.h @@ -1,10 +1,10 @@ /* ******************************************************************************* -* Copyright (C) 2004-2009, International Business Machines +* Copyright (C) 2004-2010, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* * -* file name: +* file name: uobslete.h * encoding: US-ASCII * tab size: 8 (not used) * indentation:4 diff --git a/icu4c/source/common/unicode/usystem.h b/icu4c/source/common/unicode/usystem.h index 0134076e2a..5e2f405420 100644 --- a/icu4c/source/common/unicode/usystem.h +++ b/icu4c/source/common/unicode/usystem.h @@ -1,10 +1,10 @@ /* ******************************************************************************* -* Copyright (C) 2004-2009, International Business Machines +* Copyright (C) 2004-2010, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* * -* file name: +* file name: usystem.h * encoding: US-ASCII * tab size: 8 (not used) * indentation:4 @@ -32,13 +32,13 @@ # define uloc_getDefault uloc_getDefault_SYSTEM_API_DO_NOT_USE # define uloc_setDefault uloc_setDefault_SYSTEM_API_DO_NOT_USE # else -# define u_cleanup_4_2 u_cleanup_SYSTEM_API_DO_NOT_USE -# define u_setAtomicIncDecFunctions_4_2 u_setAtomicIncDecFunctions_SYSTEM_API_DO_NOT_USE -# define u_setMemoryFunctions_4_2 u_setMemoryFunctions_SYSTEM_API_DO_NOT_USE -# define u_setMutexFunctions_4_2 u_setMutexFunctions_SYSTEM_API_DO_NOT_USE -# define ucnv_setDefaultName_4_2 ucnv_setDefaultName_SYSTEM_API_DO_NOT_USE -# define uloc_getDefault_4_2 uloc_getDefault_SYSTEM_API_DO_NOT_USE -# define uloc_setDefault_4_2 uloc_setDefault_SYSTEM_API_DO_NOT_USE +# define u_cleanup_4_4 u_cleanup_SYSTEM_API_DO_NOT_USE +# define u_setAtomicIncDecFunctions_4_4 u_setAtomicIncDecFunctions_SYSTEM_API_DO_NOT_USE +# define u_setMemoryFunctions_4_4 u_setMemoryFunctions_SYSTEM_API_DO_NOT_USE +# define u_setMutexFunctions_4_4 u_setMutexFunctions_SYSTEM_API_DO_NOT_USE +# define ucnv_setDefaultName_4_4 ucnv_setDefaultName_SYSTEM_API_DO_NOT_USE +# define uloc_getDefault_4_4 uloc_getDefault_SYSTEM_API_DO_NOT_USE +# define uloc_setDefault_4_4 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 d04eb342ae..0769492829 100644 --- a/icu4c/source/tools/gendraft/Makefile +++ b/icu4c/source/tools/gendraft/Makefile @@ -1,5 +1,5 @@ #******************************************************************************* -#* Copyright (C) 2008, International Business Machines +#* Copyright (C) 2008-2010, International Business Machines #* Corporation and others. All Rights Reserved. #******************************************************************************* @@ -11,7 +11,7 @@ top_builddir=../.. include $(top_builddir)/icudefs.mk -LOCALHEADERS= udeprctd.h udraft.h uintrnal.h usystem.h +LOCALHEADERS= udeprctd.h udraft.h uintrnal.h usystem.h COMMONHDR= $(top_srcdir)/common/unicode DOCDIR= $(top_builddir)/doc/html @@ -21,19 +21,19 @@ all: @echo Usage: 'make install-headers' to update headers. @echo 'be sure to verify the headers (in soure/common/unicode) before checkin!' @exit 1 - + clean: -$(RMV) $(LOCALHEADERS) - + $(DOCDIR): ( cd $(top_builddir) ; $(MAKE) doc ) local-headers: $(LOCALHEADERS) -install-headers: $(DOCDIR) $(LOCALHEADERS) +install-headers: $(DOCDIR) perl ./genheaders.pl --srcdir=$(DOCDIR) --destdir=$(COMMONHDR) --version=$(VERSION) --exclusion-list=$(EXCLUDE) ( cd $(COMMONHDR) ; ls -l $(LOCALHEADERS) ) %.h: $(COMMONHDR)/%.h cp $< $@ - + diff --git a/icu4c/source/tools/gendraft/genheaders.pl b/icu4c/source/tools/gendraft/genheaders.pl index 126c0f0717..00fae2dbb4 100755 --- a/icu4c/source/tools/gendraft/genheaders.pl +++ b/icu4c/source/tools/gendraft/genheaders.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl #* #******************************************************************************* -#* Copyright (C) 2006-2009, International Business Machines +#* Copyright (C) 2006-2010, International Business Machines #* Corporation and others. All Rights Reserved. #******************************************************************************* #* @@ -46,6 +46,7 @@ $internalAppend = "INTERNAL_API_DO_NOT_USE"; $internalDefine = "U_HIDE_INTERNAL_API"; $versionAppend=""; + #run the program main(); @@ -58,7 +59,8 @@ sub main(){ "--destdir=s" => \$destDir, "--version=s" => \$version, "--exclusion-list=s" => \$exclude, - "--include-types" => \$includeTypes + "--include-types" => \$includeTypes, + "--verbose" => \$verbose ); usage() unless defined $srcDir; usage() unless defined $destDir; @@ -101,6 +103,7 @@ sub getHeaderDef{ sub writeFile{ ($infile,$outfile,$destDir, $symbolAppend, $symbolDef, $exclude) = @_; + my $outFileName = $outfile; $headerDef = getHeaderDef($outfile); $outfile = $destDir."/".$outfile; @@ -167,6 +170,10 @@ sub parseWriteFile{ ($line =~ /Class/) ){ next; } + if( $line =~ /^\File [^\>]*\>([^\<]*)/ ) { + print "Skipping file-scope $symbolAppend $1\n"; + next; + } #
Global utrans_unregister
#
Global UnicodeString::kInvariant
# the below regular expression works for both the above formats. @@ -180,13 +187,17 @@ sub parseWriteFile{ #print "$value $exclude->{$value}\n"; next; } - #print "$value $realSymbol $nonExSymbol\n"; + print "$value $realSymbol $nonExSymbol :: $line\n" if defined $verbose; next if(isStringAcceptable($value)==1); + if($value =~ /^operator[^a-zA-Z]/) { + print "Skipping operator $symbolAppend $value from $line\n"; + next; + } $realSymbol = $value."_".$versionAppend; $nonExSymbol = $value."_".$symbolAppend; $disableRenaming{$value} = $nonExSymbol; $enableRenaming{$realSymbol} = $nonExSymbol; - #print "$value $realSymbol $nonExSymbol\n"; + print "$value $realSymbol $nonExSymbol\n" if defined $verbose; } }