diff --git a/icu4c/source/common/locutil.cpp b/icu4c/source/common/locutil.cpp index dd3615b919b..61b90892af4 100644 --- a/icu4c/source/common/locutil.cpp +++ b/icu4c/source/common/locutil.cpp @@ -8,7 +8,7 @@ */ #include "unicode/utypes.h" -#if !UCONFIG_NO_SERVICE +#if !UCONFIG_NO_SERVICE || !UCONFIG_NO_TRANSLITERATION #include "unicode/resbund.h" #include "cmemory.h" diff --git a/icu4c/source/common/locutil.h b/icu4c/source/common/locutil.h index 1a8871b7527..cf64e343d06 100644 --- a/icu4c/source/common/locutil.h +++ b/icu4c/source/common/locutil.h @@ -12,6 +12,9 @@ #include "unicode/utypes.h" #include "hash.h" +#if !UCONFIG_NO_SERVICE || !UCONFIG_NO_TRANSLITERATION + + U_NAMESPACE_BEGIN // temporary utility functions, till I know where to find them @@ -29,4 +32,6 @@ public: U_NAMESPACE_END +#endif + #endif diff --git a/icu4c/source/common/uprops.c b/icu4c/source/common/uprops.c index 5ecf072ca76..9ae04823959 100644 --- a/icu4c/source/common/uprops.c +++ b/icu4c/source/common/uprops.c @@ -30,6 +30,7 @@ #include "unormimp.h" #include "ubidi_props.h" #include "uprops.h" +#include "ucase.h" #define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0])) diff --git a/icu4c/source/test/intltest/intltest.cpp b/icu4c/source/test/intltest/intltest.cpp index 13639e29682..667d137916b 100644 --- a/icu4c/source/test/intltest/intltest.cpp +++ b/icu4c/source/test/intltest/intltest.cpp @@ -35,6 +35,10 @@ #include "cmemory.h" #include "uoptions.h" +#include "putilimp.h" // for uprv_getUTCtime() +#include "unicode/locid.h" + + #ifdef XP_MAC_CONSOLE #include #include "Files.h" @@ -983,7 +987,7 @@ main(int argc, char* argv[]) U_MAIN_INIT_ARGS(argc, argv); - startTime = Calendar::getNow(); + startTime = uprv_getUTCtime(); for (int i = 1; i < argc; ++i) { if (argv[i][0] == '-') { @@ -1222,7 +1226,7 @@ main(int argc, char* argv[]) if (execCount <= 0) { fprintf(stdout, "***** Not all called tests actually exist! *****\n"); } - endTime = Calendar::getNow(); + endTime = uprv_getUTCtime(); diffTime = (int32_t)(endTime - startTime); printf("Elapsed Time: %02d:%02d:%02d.%03d\n", ((diffTime%U_MILLIS_PER_DAY)/U_MILLIS_PER_HOUR), diff --git a/icu4c/source/test/intltest/strcase.cpp b/icu4c/source/test/intltest/strcase.cpp index f6d5b6102d1..b10fa17f529 100644 --- a/icu4c/source/test/intltest/strcase.cpp +++ b/icu4c/source/test/intltest/strcase.cpp @@ -493,6 +493,7 @@ StringCaseTest::TestCasing() { } delete driver; +#if !UCONFIG_NO_BREAK_ITERATION // more tests for API coverage status=U_ZERO_ERROR; input=UNICODE_STRING_SIMPLE("sTrA\\u00dfE").unescape(); @@ -500,4 +501,5 @@ StringCaseTest::TestCasing() { if(result!=UNICODE_STRING_SIMPLE("Stra\\u00dfe").unescape()) { errln("UnicodeString::toTitle(NULL) failed"); } +#endif } diff --git a/icu4c/source/test/intltest/uobjtest.cpp b/icu4c/source/test/intltest/uobjtest.cpp index 5090f2c64a6..a1f5171d8d6 100644 --- a/icu4c/source/test/intltest/uobjtest.cpp +++ b/icu4c/source/test/intltest/uobjtest.cpp @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 2002-2004, International Business Machines Corporation and + * Copyright (c) 2002-2005, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ @@ -203,11 +203,13 @@ UObject *UObjectTest::testClass(UObject *obj, #define UOBJTEST_TEST_INTERNALS 0 /* do NOT test Internal things - their functions aren't exported on Win32 */ +#if !UCONFIG_NO_SERVICE /* The whole purpose of this class is to expose the constructor, and gain access to the superclasses RTTI. */ class TestLocaleKeyFactory : public LocaleKeyFactory { public: TestLocaleKeyFactory(int32_t coverage) : LocaleKeyFactory(coverage) {} }; +#endif void UObjectTest::testIDs() { @@ -215,7 +217,7 @@ void UObjectTest::testIDs() UErrorCode status = U_ZERO_ERROR; static const UChar SMALL_STR[] = {0x51, 0x51, 0x51, 0}; // "QQQ" -#if !UCONFIG_NO_TRANSLITERATION && !UCONFIG_NO_FORMATTING +#if !UCONFIG_NO_TRANSLITERATION || !UCONFIG_NO_FORMATTING UParseError parseError; #endif