From cce314dc85b4c70f8e50315b6a1697c2e56ce4ae Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Thu, 18 Oct 2012 19:51:28 +0000 Subject: [PATCH] ICU-9581 Handle uconfig.h variations: fix errors and some of the old warnings X-SVN-Rev: 32659 --- icu4c/source/test/cintltst/calltest.c | 4 ++ icu4c/source/test/cintltst/cbiapts.c | 4 ++ icu4c/source/test/cintltst/ccapitst.c | 13 +++++-- icu4c/source/test/cintltst/ccolltst.c | 4 +- icu4c/source/test/cintltst/cconvtst.c | 4 +- icu4c/source/test/cintltst/cldrtest.c | 7 +++- icu4c/source/test/cintltst/cloctst.c | 2 + icu4c/source/test/cintltst/cnormtst.c | 10 +---- icu4c/source/test/cintltst/ncnvfbts.c | 8 +--- icu4c/source/test/cintltst/nucnvtst.c | 7 +++- icu4c/source/test/cintltst/udatatst.c | 14 +++++-- icu4c/source/test/intltest/genderinfotest.cpp | 9 ++++- icu4c/source/test/intltest/locnmtst.cpp | 38 ++++++++++--------- icu4c/source/test/intltest/rbbitst.cpp | 2 + icu4c/source/test/iotest/iotest.cpp | 3 +- 15 files changed, 82 insertions(+), 47 deletions(-) diff --git a/icu4c/source/test/cintltst/calltest.c b/icu4c/source/test/cintltst/calltest.c index d6d0efe3ffe..a2e60c67a7c 100644 --- a/icu4c/source/test/cintltst/calltest.c +++ b/icu4c/source/test/cintltst/calltest.c @@ -39,7 +39,9 @@ void addUTextTest(TestNode** root); void addUCsdetTest(TestNode** root); void addCnvSelTest(TestNode** root); void addUSpoofTest(TestNode** root); +#if !UCONFIG_NO_FORMATTING void addGendInfoForTest(TestNode** root); +#endif void addAllTests(TestNode** root) { @@ -80,5 +82,7 @@ void addAllTests(TestNode** root) addUSpoofTest(root); #endif addPUtilTest(root); +#if !UCONFIG_NO_FORMATTING addGendInfoForTest(root); +#endif } diff --git a/icu4c/source/test/cintltst/cbiapts.c b/icu4c/source/test/cintltst/cbiapts.c index 968b92754af..a35c79584f0 100644 --- a/icu4c/source/test/cintltst/cbiapts.c +++ b/icu4c/source/test/cintltst/cbiapts.c @@ -38,7 +38,9 @@ log_data_err("Failure at file %s, line %d, error = %s (Are you missing data?)\n" #define TEST_ASSERT(expr) {if ((expr)==FALSE) { \ log_data_err("Test Failure at file %s, line %d (Are you missing data?)\n", __FILE__, __LINE__);}} +#if !UCONFIG_NO_FILE_IO static void TestBreakIteratorSafeClone(void); +#endif static void TestBreakIteratorRules(void); static void TestBreakIteratorRuleError(void); static void TestBreakIteratorStatusVec(void); @@ -135,6 +137,7 @@ static void freeToUCharStrings(void **hook) { } +#if !UCONFIG_NO_FILE_IO static void TestBreakIteratorCAPI() { UErrorCode status = U_ZERO_ERROR; @@ -499,6 +502,7 @@ static void TestBreakIteratorSafeClone(void) ubrk_close(someIterators[i]); } } +#endif /* diff --git a/icu4c/source/test/cintltst/ccapitst.c b/icu4c/source/test/cintltst/ccapitst.c index e8c5ab6db7f..1ac3bb3db62 100644 --- a/icu4c/source/test/cintltst/ccapitst.c +++ b/icu4c/source/test/cintltst/ccapitst.c @@ -35,8 +35,10 @@ #define UCS_FILE_NAME_SIZE 512 /*returns an action other than the one provided*/ +#if !UCONFIG_NO_LEGACY_CONVERSION static UConverterFromUCallback otherUnicodeAction(UConverterFromUCallback MIA); static UConverterToUCallback otherCharAction(UConverterToUCallback MIA); +#endif static UConverter * cnv_open(const char *name, UErrorCode *pErrorCode) { @@ -54,7 +56,9 @@ static void TestDuplicateAlias(void); static void TestCCSID(void); static void TestJ932(void); static void TestJ1968(void); +#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION static void TestLMBCSMaxChar(void); +#endif #if !UCONFIG_NO_LEGACY_CONVERSION static void TestConvertSafeCloneCallback(void); @@ -1042,16 +1046,17 @@ static void TestConvert() #endif } +#if !UCONFIG_NO_LEGACY_CONVERSION static UConverterFromUCallback otherUnicodeAction(UConverterFromUCallback MIA) { return (MIA==(UConverterFromUCallback)UCNV_FROM_U_CALLBACK_STOP)?(UConverterFromUCallback)UCNV_FROM_U_CALLBACK_SUBSTITUTE:(UConverterFromUCallback)UCNV_FROM_U_CALLBACK_STOP; } - static UConverterToUCallback otherCharAction(UConverterToUCallback MIA) { return (MIA==(UConverterToUCallback)UCNV_TO_U_CALLBACK_STOP)?(UConverterToUCallback)UCNV_TO_U_CALLBACK_SUBSTITUTE:(UConverterToUCallback)UCNV_TO_U_CALLBACK_STOP; } +#endif static void TestFlushCache(void) { #if !UCONFIG_NO_LEGACY_CONVERSION @@ -1351,6 +1356,7 @@ static TSCCContext *TSCC_clone(TSCCContext *ctx) return newCtx; } +#if !UCONFIG_NO_LEGACY_CONVERSION static void TSCC_fromU(const void *context, UConverterFromUnicodeArgs *fromUArgs, const UChar* codeUnits, @@ -1398,7 +1404,6 @@ static void TSCC_fromU(const void *context, } } - static void TSCC_toU(const void *context, UConverterToUnicodeArgs *toUArgs, const char* codeUnits, @@ -1466,7 +1471,6 @@ static void TSCC_print_log(TSCCContext *q, const char *name) } } -#if !UCONFIG_NO_LEGACY_CONVERSION static void TestConvertSafeCloneCallback() { UErrorCode err = U_ZERO_ERROR; @@ -2852,6 +2856,7 @@ ucnv_close(cnv); #endif } +#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION static void TestLMBCSMaxChar(void) { static const struct { int8_t maxSize; @@ -2921,7 +2926,7 @@ static void TestLMBCSMaxChar(void) { log_err("error UCNV_GET_MAX_BYTES_FOR_STRING(1, 2)<10\n"); } } - +#endif static void TestJ1968(void) { UErrorCode err = U_ZERO_ERROR; diff --git a/icu4c/source/test/cintltst/ccolltst.c b/icu4c/source/test/cintltst/ccolltst.c index 6aeaa9a9552..796294032a1 100644 --- a/icu4c/source/test/cintltst/ccolltst.c +++ b/icu4c/source/test/cintltst/ccolltst.c @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 1997-2009, International Business Machines Corporation and + * Copyright (c) 1997-2012, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ /******************************************************************************** @@ -30,7 +30,9 @@ void addCollTest(TestNode** root) { addCollAPITest(root); addCurrencyCollTest(root); +#if !UCONFIG_NO_NORMALIZATION addNormTest(root); +#endif addGermanCollTest(root); addSpanishCollTest(root); addFrenchCollTest(root); diff --git a/icu4c/source/test/cintltst/cconvtst.c b/icu4c/source/test/cintltst/cconvtst.c index 4399749580a..41bfd733d06 100644 --- a/icu4c/source/test/cintltst/cconvtst.c +++ b/icu4c/source/test/cintltst/cconvtst.c @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 1997-2009, International Business Machines Corporation and + * Copyright (c) 1997-2012, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ /******************************************************************************** @@ -34,6 +34,8 @@ void addConvert(TestNode** root) addBOCU1Tests(root); addTestConvertErrorCallBack(root); addTestEuroRegression(root); +#if !UCONFIG_NO_LEGACY_CONVERSION addTestConverterFallBack(root); +#endif addExtraTests(root); } diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index e4fdfe8d9d0..a996086b152 100644 --- a/icu4c/source/test/cintltst/cldrtest.c +++ b/icu4c/source/test/cintltst/cldrtest.c @@ -68,6 +68,7 @@ isCurrencyPreEuro(const char* currencyKey){ } return FALSE; } +#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION static void TestKeyInRootRecursive(UResourceBundle *root, const char *rootName, UResourceBundle *currentBundle, const char *locale) { @@ -441,7 +442,7 @@ TestKeyInRootRecursive(UResourceBundle *root, const char *rootName, ures_close(subBundle); } } - +#endif static void testLCID(UResourceBundle *currentBundle, @@ -482,6 +483,7 @@ testLCID(UResourceBundle *currentBundle, } } +#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION static void TestLocaleStructure(void) { UResourceBundle *root, *currentLocale; @@ -563,6 +565,7 @@ TestLocaleStructure(void) { ures_close(root); } +#endif static void compareArrays(const char *keyName, @@ -1269,6 +1272,7 @@ static void TestIndexChars(void) { +#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION static void TestCurrencyList(void){ #if !UCONFIG_NO_FORMATTING UErrorCode errorCode = U_ZERO_ERROR; @@ -1303,6 +1307,7 @@ static void TestCurrencyList(void){ uenum_close(en); #endif } +#endif static void TestAvailableIsoCodes(void){ #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c index bae69cf6d7f..e3c6d717ace 100644 --- a/icu4c/source/test/cintltst/cloctst.c +++ b/icu4c/source/test/cintltst/cloctst.c @@ -1020,6 +1020,7 @@ setUpDataTable(); cleanUpDataTable(); } +#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION /* test for uloc_getISOLanguages, uloc_getISOCountries */ static void TestISOFunctions() { @@ -1151,6 +1152,7 @@ static void TestISOFunctions() ures_close(subRes); ures_close(res); } +#endif static void setUpDataTable() { diff --git a/icu4c/source/test/cintltst/cnormtst.c b/icu4c/source/test/cintltst/cnormtst.c index 183ff589e62..1979167d8de 100644 --- a/icu4c/source/test/cintltst/cnormtst.c +++ b/icu4c/source/test/cintltst/cnormtst.c @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 1997-2011, International Business Machines Corporation and + * Copyright (c) 1997-2012, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ /******************************************************************************** @@ -19,13 +19,7 @@ #include "unicode/utf16.h" #include "cintltst.h" -#if UCONFIG_NO_NORMALIZATION - -void addNormTest(TestNode** root) { - /* no normalization - nothing to do */ -} - -#else +#if !UCONFIG_NO_NORMALIZATION #include #include diff --git a/icu4c/source/test/cintltst/ncnvfbts.c b/icu4c/source/test/cintltst/ncnvfbts.c index 43f8c48b4bd..a2358be777f 100644 --- a/icu4c/source/test/cintltst/ncnvfbts.c +++ b/icu4c/source/test/cintltst/ncnvfbts.c @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 1997-2010, International Business Machines Corporation and + * Copyright (c) 1997-2012, International Business Machines Corporation and * others. All Rights Reserved. ***************************************************************************/ /***************************************************************************** @@ -747,11 +747,5 @@ static void TestConvertFallBackWithBufferSizes(int32_t outsize, int32_t insize ) log_err("ibm-1371(MBCS conversion with single-byte) -> u did not match.,\n"); } -} -#else -void addTestConverterFallBack(TestNode** root) -{ - /* test nothing... */ - } #endif diff --git a/icu4c/source/test/cintltst/nucnvtst.c b/icu4c/source/test/cintltst/nucnvtst.c index 5742de0318d..f4a443cd962 100644 --- a/icu4c/source/test/cintltst/nucnvtst.c +++ b/icu4c/source/test/cintltst/nucnvtst.c @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 1997-2011, International Business Machines Corporation and + * Copyright (c) 1997-2012, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ /******************************************************************************* @@ -33,7 +33,9 @@ static void TestNextUCharError(UConverter* cnv, const char* source, const char* #if !UCONFIG_NO_COLLATION static void TestJitterbug981(void); #endif +#if !UCONFIG_NO_LEGACY_CONVERSION static void TestJitterbug1293(void); +#endif static void TestNewConvertWithBufferSizes(int32_t osize, int32_t isize) ; static void TestConverterTypesAndStarters(void); static void TestAmbiguous(void); @@ -5422,6 +5424,7 @@ static void TestJitterbug981(){ #endif +#if !UCONFIG_NO_LEGACY_CONVERSION static void TestJitterbug1293(){ static const UChar src[] = {0x30DE, 0x30A4, 0x5E83, 0x544A, 0x30BF, 0x30A4, 0x30D7,0x000}; char target[256]; @@ -5449,6 +5452,8 @@ static void TestJitterbug1293(){ } ucnv_close(conv); } +#endif + static void TestJB5275_1(){ static const char* data = "\x3B\xB3\x0A" /* Easy characters */ diff --git a/icu4c/source/test/cintltst/udatatst.c b/icu4c/source/test/cintltst/udatatst.c index bfacb6d840d..a2f024510b8 100644 --- a/icu4c/source/test/cintltst/udatatst.c +++ b/icu4c/source/test/cintltst/udatatst.c @@ -66,16 +66,18 @@ unorm2_swap(const UDataSwapper *ds, #define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0])) +#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION static void TestUDataOpen(void); static void TestUDataOpenChoiceDemo1(void); static void TestUDataOpenChoiceDemo2(void); static void TestUDataGetInfo(void); static void TestUDataGetMemory(void); -static void TestUDataSetAppData(void); static void TestErrorConditions(void); static void TestAppData(void); -static void TestICUDataName(void); static void TestSwapData(void); +#endif +static void TestUDataSetAppData(void); +static void TestICUDataName(void); static void PointerTableOfContents(void); static void SetBadCommonData(void); static void TestUDataFileAccess(void); @@ -116,6 +118,7 @@ static void lots_of_mallocs() } #endif +#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION static void TestUDataOpen(){ UDataMemory *result; UErrorCode status=U_ZERO_ERROR; @@ -349,6 +352,7 @@ static void TestUDataOpen(){ free(path); } +#endif typedef struct { uint16_t headerSize; @@ -597,6 +601,7 @@ isAcceptable3(void *context, } +#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION static void TestUDataOpenChoiceDemo1() { UDataMemory *result; UErrorCode status=U_ZERO_ERROR; @@ -744,7 +749,6 @@ static void TestUDataOpenChoiceDemo2() { } } - static void TestUDataGetInfo() { UDataMemory *result; @@ -1073,6 +1077,7 @@ static void TestAppData() ures_close(icu); ures_close(app); } +#endif static void TestICUDataName() { @@ -1574,6 +1579,7 @@ printErrorToString(void *context, const char *fmt, va_list args) { vsprintf((char *)context, fmt, args); } +#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION static void TestSwapData() { char name[100]; @@ -1688,7 +1694,7 @@ TestSwapData() { free(buffer); } - +#endif static void PointerTableOfContents() { UDataMemory *dataItem; diff --git a/icu4c/source/test/intltest/genderinfotest.cpp b/icu4c/source/test/intltest/genderinfotest.cpp index b6ba6eb0973..535e5fa3a4c 100644 --- a/icu4c/source/test/intltest/genderinfotest.cpp +++ b/icu4c/source/test/intltest/genderinfotest.cpp @@ -6,11 +6,14 @@ /* Modification History: */ -#include +#include "unicode/utypes.h" -#include "intltest.h" +#if !UCONFIG_NO_FORMATTING + +#include #include "unicode/gender.h" #include "unicode/unum.h" +#include "intltest.h" #define LENGTHOF(array) (int32_t)(sizeof(array) / sizeof((array)[0])) @@ -115,3 +118,5 @@ void GenderInfoTest::checkLocale( extern IntlTest *createGenderInfoTest() { return new GenderInfoTest(); } + +#endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/icu4c/source/test/intltest/locnmtst.cpp b/icu4c/source/test/intltest/locnmtst.cpp index 343059d30d3..e49db097446 100644 --- a/icu4c/source/test/intltest/locnmtst.cpp +++ b/icu4c/source/test/intltest/locnmtst.cpp @@ -255,7 +255,6 @@ void LocaleDisplayNamesTest::TestUldnComponents() { } - typedef struct { const char * displayLocale; UDisplayContext dialectHandling; @@ -268,37 +267,42 @@ static char en[] = "en"; static char en_US[] = "en_US"; static UChar daFor_en[] = {0x65,0x6E,0x67,0x65,0x6C,0x73,0x6B,0}; //"engelsk" -static UChar daFor_en_T[] = {0x45,0x6E,0x67,0x65,0x6C,0x73,0x6B,0}; //"Engelsk" static UChar daFor_en_US[] = {0x65,0x6E,0x67,0x65,0x6C,0x73,0x6B,0x20,0x28,0x55,0x53,0x41,0x29,0}; //"engelsk (USA)" -static UChar daFor_en_US_T[] = {0x45,0x6E,0x67,0x65,0x6C,0x73,0x6B,0x20,0x28,0x55,0x53,0x41,0x29,0}; //"Engelsk (USA)" static UChar daFor_en_US_D[] = {0x61,0x6D,0x65,0x72,0x69,0x6B,0x61,0x6E,0x73,0x6B,0x20,0x65,0x6E,0x67,0x65,0x6C,0x73,0x6B,0}; //"amerikansk engelsk" -static UChar daFor_en_US_DT[] = {0x41,0x6D,0x65,0x72,0x69,0x6B,0x61,0x6E,0x73,0x6B,0x20,0x65,0x6E,0x67,0x65,0x6C,0x73,0x6B,0}; //"Amerikansk engelsk" static UChar esFor_en[] = {0x69,0x6E,0x67,0x6C,0xE9,0x73,0}; //"ingles" with acute on e -static UChar esFor_en_T[] = {0x49,0x6E,0x67,0x6C,0xE9,0x73,0}; //"Ingles" ... static UChar esFor_en_US[] = {0x69,0x6E,0x67,0x6C,0xE9,0x73,0x20,0x28,0x45,0x73,0x74,0x61,0x64,0x6F,0x73,0x20,0x55,0x6E,0x69,0x64,0x6F,0x73,0x29,0}; //"ingles (Estados Unidos)" ... -static UChar esFor_en_US_T[] = {0x49,0x6E,0x67,0x6C,0xE9,0x73,0x20,0x28,0x45,0x73,0x74,0x61,0x64,0x6F,0x73,0x20,0x55,0x6E,0x69,0x64,0x6F,0x73,0x29,0}; //"Ingles (Estados Unidos)" ... static UChar esFor_en_US_D[] = {0x69,0x6E,0x67,0x6C,0xE9,0x73,0x20,0x65,0x73,0x74,0x61,0x64,0x6F,0x75,0x6E,0x69,0x64,0x65,0x6E,0x73,0x65,0}; //"ingles estadounidense" ... +#if !UCONFIG_NO_BREAK_ITERATION +static UChar daFor_en_T[] = {0x45,0x6E,0x67,0x65,0x6C,0x73,0x6B,0}; //"Engelsk" +static UChar daFor_en_US_T[] = {0x45,0x6E,0x67,0x65,0x6C,0x73,0x6B,0x20,0x28,0x55,0x53,0x41,0x29,0}; //"Engelsk (USA)" +static UChar daFor_en_US_DT[] = {0x41,0x6D,0x65,0x72,0x69,0x6B,0x61,0x6E,0x73,0x6B,0x20,0x65,0x6E,0x67,0x65,0x6C,0x73,0x6B,0}; //"Amerikansk engelsk" +static UChar esFor_en_T[] = {0x49,0x6E,0x67,0x6C,0xE9,0x73,0}; //"Ingles" ... +static UChar esFor_en_US_T[] = {0x49,0x6E,0x67,0x6C,0xE9,0x73,0x20,0x28,0x45,0x73,0x74,0x61,0x64,0x6F,0x73,0x20,0x55,0x6E,0x69,0x64,0x6F,0x73,0x29,0}; //"Ingles (Estados Unidos)" ... static UChar esFor_en_US_DT[] = {0x49,0x6E,0x67,0x6C,0xE9,0x73,0x20,0x65,0x73,0x74,0x61,0x64,0x6F,0x75,0x6E,0x69,0x64,0x65,0x6E,0x73,0x65,0}; //"Ingles estadounidense" ... +#endif /* #if !UCONFIG_NO_BREAK_ITERATION */ static const LocNameDispContextItem ctxtItems[] = { { "da", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, en, daFor_en }, - { "da", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, en, daFor_en_T }, - { "da", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, en, daFor_en }, { "da", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, en_US, daFor_en_US }, - { "da", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, en_US, daFor_en_US_T }, - { "da", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, en_US, daFor_en_US }, { "da", UDISPCTX_DIALECT_NAMES, UDISPCTX_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, en_US, daFor_en_US_D }, - { "da", UDISPCTX_DIALECT_NAMES, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, en_US, daFor_en_US_DT }, - { "da", UDISPCTX_DIALECT_NAMES, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, en_US, daFor_en_US_D }, { "es", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, en, esFor_en }, - { "es", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, en, esFor_en_T }, - { "es", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, en, esFor_en_T }, { "es", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, en_US, esFor_en_US }, - { "es", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, en_US, esFor_en_US_T }, - { "es", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, en_US, esFor_en_US_T }, { "es", UDISPCTX_DIALECT_NAMES, UDISPCTX_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, en_US, esFor_en_US_D }, - { "es", UDISPCTX_DIALECT_NAMES, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, en_US, esFor_en_US_DT }, +#if !UCONFIG_NO_BREAK_ITERATION + { "da", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, en, daFor_en_T }, + { "da", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, en_US, daFor_en_US_T }, + { "da", UDISPCTX_DIALECT_NAMES, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, en_US, daFor_en_US_DT }, + { "es", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, en, esFor_en_T }, + { "es", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, en_US, esFor_en_US_T }, { "es", UDISPCTX_DIALECT_NAMES, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, en_US, esFor_en_US_DT }, + + { "da", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, en, daFor_en }, + { "da", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, en_US, daFor_en_US }, + { "da", UDISPCTX_DIALECT_NAMES, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, en_US, daFor_en_US_D }, + { "es", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, en, esFor_en_T }, + { "es", UDISPCTX_STANDARD_NAMES, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, en_US, esFor_en_US_T }, + { "es", UDISPCTX_DIALECT_NAMES, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, en_US, esFor_en_US_DT }, + #endif /* #if !UCONFIG_NO_BREAK_ITERATION */ { NULL, (UDisplayContext)0, (UDisplayContext)0, NULL, NULL } }; diff --git a/icu4c/source/test/intltest/rbbitst.cpp b/icu4c/source/test/intltest/rbbitst.cpp index 4f8961cf102..c803db9bb21 100644 --- a/icu4c/source/test/intltest/rbbitst.cpp +++ b/icu4c/source/test/intltest/rbbitst.cpp @@ -3339,6 +3339,7 @@ static int32_t getIntParam(UnicodeString name, UnicodeString ¶ms, int32_t d } #endif +#if !UCONFIG_NO_REGULAR_EXPRESSIONS static void testBreakBoundPreceding(RBBITest *test, UnicodeString ustr, BreakIterator *bi, int expected[], @@ -3408,6 +3409,7 @@ static void testBreakBoundPreceding(RBBITest *test, UnicodeString ustr, } } } +#endif void RBBITest::TestWordBreaks(void) { diff --git a/icu4c/source/test/iotest/iotest.cpp b/icu4c/source/test/iotest/iotest.cpp index 1bfae3e88cf..2b97a2ed2e4 100644 --- a/icu4c/source/test/iotest/iotest.cpp +++ b/icu4c/source/test/iotest/iotest.cpp @@ -171,6 +171,7 @@ public: const char* DataDrivenLogger::fgDataDir = NULL; char* DataDrivenLogger::fgTestDataPath = NULL; +#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_FILE_IO static int64_t uto64(const UChar *buffer) { @@ -187,7 +188,7 @@ uto64(const UChar *buffer) } return result; } - +#endif U_CDECL_BEGIN static void U_CALLCONV DataDrivenPrintf(void)