From 2f7feeea3e8c643393875d7d68f3f6674b382292 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Thu, 15 Jan 2004 22:12:26 +0000 Subject: [PATCH] ICU-3236 Don't export some functions X-SVN-Rev: 14331 --- icu4c/source/i18n/astro.cpp | 2 +- icu4c/source/i18n/hebrwcal.cpp | 2 +- icu4c/source/i18n/nfrs.cpp | 2 +- icu4c/source/i18n/ucol_cnt.cpp | 4 ++-- icu4c/source/i18n/ucol_elm.cpp | 12 ++++++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/icu4c/source/i18n/astro.cpp b/icu4c/source/i18n/astro.cpp index a843d5c68c8..1b33c12bdef 100644 --- a/icu4c/source/i18n/astro.cpp +++ b/icu4c/source/i18n/astro.cpp @@ -1463,7 +1463,7 @@ UnicodeString CalendarAstronomer::Horizon::toString() const // } // =============== Calendar Cache ================ -UMTX ccLock = NULL; +static UMTX ccLock = NULL; void CalendarCache::createCache(CalendarCache** cache, UErrorCode& status) { ucln_i18n_registerCleanup(); diff --git a/icu4c/source/i18n/hebrwcal.cpp b/icu4c/source/i18n/hebrwcal.cpp index c933ee5aa4a..4683c2d36fb 100644 --- a/icu4c/source/i18n/hebrwcal.cpp +++ b/icu4c/source/i18n/hebrwcal.cpp @@ -134,7 +134,7 @@ static const int32_t LEAP_MONTH_START[][3] = { // Data Members... //------------------------------------------------------------------------- -CalendarCache *gCache = NULL; +static CalendarCache *gCache = NULL; //------------------------------------------------------------------------- // Constructors... diff --git a/icu4c/source/i18n/nfrs.cpp b/icu4c/source/i18n/nfrs.cpp index ee41077d06d..07e4d5a75e1 100644 --- a/icu4c/source/i18n/nfrs.cpp +++ b/icu4c/source/i18n/nfrs.cpp @@ -266,7 +266,7 @@ NFRuleSet::~NFRuleSet() delete fractionRules[2]; } -UBool +static UBool util_equalRules(const NFRule* rule1, const NFRule* rule2) { if (rule1) { diff --git a/icu4c/source/i18n/ucol_cnt.cpp b/icu4c/source/i18n/ucol_cnt.cpp index 5f9bfb32504..7189293a07e 100644 --- a/icu4c/source/i18n/ucol_cnt.cpp +++ b/icu4c/source/i18n/ucol_cnt.cpp @@ -28,7 +28,7 @@ U_NAMESPACE_BEGIN -void uprv_growTable(ContractionTable *tbl, UErrorCode *status) { +static void uprv_growTable(ContractionTable *tbl, UErrorCode *status) { if(tbl->position == tbl->size) { uint32_t *newData = (uint32_t *)uprv_realloc(tbl->CEs, 2*tbl->size*sizeof(uint32_t)); if(newData == NULL) { @@ -228,7 +228,7 @@ uprv_cnttab_constructTable(CntTable *table, uint32_t mainOffset, UErrorCode *sta return table->position; } -ContractionTable *uprv_cnttab_cloneContraction(ContractionTable *t, UErrorCode *status) { +static ContractionTable *uprv_cnttab_cloneContraction(ContractionTable *t, UErrorCode *status) { ContractionTable *r = (ContractionTable *)uprv_malloc(sizeof(ContractionTable)); if(r == NULL) { *status = U_MEMORY_ALLOCATION_ERROR; diff --git a/icu4c/source/i18n/ucol_elm.cpp b/icu4c/source/i18n/ucol_elm.cpp index cfbaab133da..26961fa357d 100644 --- a/icu4c/source/i18n/ucol_elm.cpp +++ b/icu4c/source/i18n/ucol_elm.cpp @@ -406,7 +406,7 @@ uprv_uca_closeTempTable(tempUCATable *t) { * @param status error status * @returns size of the maxexpansion and maxsize used. */ -int uprv_uca_setMaxExpansion(uint32_t endexpansion, +static int uprv_uca_setMaxExpansion(uint32_t endexpansion, uint8_t expansionsize, MaxExpansionTable *maxexpansion, UErrorCode *status) @@ -548,7 +548,7 @@ int uprv_uca_setMaxExpansion(uint32_t endexpansion, * @param status error status * @returns size of the maxexpansion and maxsize used. */ -int uprv_uca_setMaxJamoExpansion(UChar ch, +static int uprv_uca_setMaxJamoExpansion(UChar ch, uint32_t endexpansion, uint8_t expansionsize, MaxJamoExpansionTable *maxexpansion, @@ -705,7 +705,7 @@ static void uprv_uca_unsafeCPAddCCNZ(tempUCATable *t, UErrorCode *status) { } } -uint32_t uprv_uca_addPrefix(tempUCATable *t, uint32_t CE, +static uint32_t uprv_uca_addPrefix(tempUCATable *t, uint32_t CE, UCAElements *element, UErrorCode *status) { // currently the longest prefix we're supporting in Japanese is two characters // long. Although this table could quite easily mimic complete contraction stuff @@ -825,7 +825,7 @@ uint32_t uprv_uca_addPrefix(tempUCATable *t, uint32_t CE, // in the contraction, it is going to be handled as a pair of code units, // as it doesn't affect the performance AND handling surrogates specially // would complicate code way too much. -uint32_t uprv_uca_addContraction(tempUCATable *t, uint32_t CE, +static uint32_t uprv_uca_addContraction(tempUCATable *t, uint32_t CE, UCAElements *element, UErrorCode *status) { CntTable *contractions = t->contractions; UChar32 cp; @@ -1176,7 +1176,7 @@ uprv_uca_addAnElement(tempUCATable *t, UCAElements *element, UErrorCode *status) /*void uprv_uca_getMaxExpansionJamo(CompactEIntArray *mapping, */ -void uprv_uca_getMaxExpansionJamo(UNewTrie *mapping, +static void uprv_uca_getMaxExpansionJamo(UNewTrie *mapping, MaxExpansionTable *maxexpansion, MaxJamoExpansionTable *maxjamoexpansion, UBool jamospecial, @@ -1522,7 +1522,7 @@ _enumCategoryRangeClosureCategory(const void *context, UChar32 start, UChar32 li el.prefixSize = 0; el.noOfCEs = 0; ucol_setText(colEl, decomp, noOfDec, status); - while((el.CEs[el.noOfCEs] = ucol_next(colEl, status)) != UCOL_NULLORDER) { + while((el.CEs[el.noOfCEs] = ucol_next(colEl, status)) != (uint32_t)UCOL_NULLORDER) { el.noOfCEs++; } } else {