diff --git a/icu4c/source/test/cintltst/capitst.c b/icu4c/source/test/cintltst/capitst.c index 9b91fc779b..9f10f97ca3 100644 --- a/icu4c/source/test/cintltst/capitst.c +++ b/icu4c/source/test/cintltst/capitst.c @@ -1494,6 +1494,13 @@ static int tMemCmp(const uint8_t *first, const uint8_t *second) { int32_t secondLen = uprv_strlen((const char *)second); return uprv_memcmp(first, second, uprv_min(firstLen, secondLen)); } +static const char * strengthsC[] = { + "UCOL_PRIMARY", + "UCOL_SECONDARY", + "UCOL_TERTIARY", + "UCOL_QUATERNARY", + "UCOL_IDENTICAL" +}; void TestMergeSortKeys(void) { UErrorCode status = U_ZERO_ERROR; diff --git a/icu4c/source/test/cintltst/capitst.h b/icu4c/source/test/cintltst/capitst.h index bad6d7798e..8f9d60c77c 100644 --- a/icu4c/source/test/cintltst/capitst.h +++ b/icu4c/source/test/cintltst/capitst.h @@ -103,7 +103,6 @@ * utility function, defined in cmsccoll.c */ void genericLocaleStarter(const char *locale, const char *s[], uint32_t size); - const char * strengthsC[]; #endif /* #if !UCONFIG_NO_COLLATION */ diff --git a/icu4c/source/test/cintltst/cmsccoll.c b/icu4c/source/test/cintltst/cmsccoll.c index 6c3ecb5275..af75b07f29 100644 --- a/icu4c/source/test/cintltst/cmsccoll.c +++ b/icu4c/source/test/cintltst/cmsccoll.c @@ -401,7 +401,8 @@ UColAttributeValue strengths[] = { UCOL_IDENTICAL }; -const char * strengthsC[] = { +#if 0 +static const char * strengthsC[] = { "UCOL_PRIMARY", "UCOL_SECONDARY", "UCOL_TERTIARY", @@ -409,7 +410,6 @@ const char * strengthsC[] = { "UCOL_IDENTICAL" }; -#if 0 static const char * caseFirstC[] = { "UCOL_OFF", "UCOL_LOWER_FIRST",