diff --git a/icu4c/source/test/intltest/idnaref.cpp b/icu4c/source/test/intltest/idnaref.cpp index 03d516cea42..e0991ae4ae3 100644 --- a/icu4c/source/test/intltest/idnaref.cpp +++ b/icu4c/source/test/intltest/idnaref.cpp @@ -16,8 +16,7 @@ #include "unicode/utypes.h" -#if !UCONFIG_NO_IDNA - +#if !UCONFIG_NO_IDNA && !UCONFIG_NO_TRANSLITERATION #include "idnaref.h" #include "strprep.h" #include "punyref.h" @@ -987,5 +986,4 @@ CLEANUP: return result; } - #endif /* #if !UCONFIG_NO_IDNA */ diff --git a/icu4c/source/test/intltest/itmajor.cpp b/icu4c/source/test/intltest/itmajor.cpp index bf00b86881b..9faedbef2e8 100644 --- a/icu4c/source/test/intltest/itmajor.cpp +++ b/icu4c/source/test/intltest/itmajor.cpp @@ -139,7 +139,7 @@ void MajorTestLevel::runIndexedTest( int32_t index, UBool exec, const char* &nam #endif break; case 10: name = "idna"; -#if !UCONFIG_NO_IDNA +#if !UCONFIG_NO_IDNA && !UCONFIG_NO_TRANSLITERATION if(exec){ logln("TestSuite IDNA----"); logln(); TestIDNA test; diff --git a/icu4c/source/test/intltest/nptrans.cpp b/icu4c/source/test/intltest/nptrans.cpp index 4ec67707ae1..6fcde250160 100644 --- a/icu4c/source/test/intltest/nptrans.cpp +++ b/icu4c/source/test/intltest/nptrans.cpp @@ -16,6 +16,7 @@ #include "unicode/utypes.h" +#if !UCONFIG_NO_TRANSLITERATION #if !UCONFIG_NO_IDNA #include "nptrans.h" @@ -277,3 +278,4 @@ UBool NamePrepTransform::isLabelSeparator(UChar32 ch, UErrorCode& status){ } #endif /* #if !UCONFIG_NO_IDNA */ +#endif /* #if !UCONFIG_NO_TRANSLITERATION */ diff --git a/icu4c/source/test/intltest/nptrans.h b/icu4c/source/test/intltest/nptrans.h index 06b45db12bb..007a7ef894b 100644 --- a/icu4c/source/test/intltest/nptrans.h +++ b/icu4c/source/test/intltest/nptrans.h @@ -20,6 +20,7 @@ #include "unicode/utypes.h" #if !UCONFIG_NO_IDNA +#if !UCONFIG_NO_TRANSLITERATION #include "strprep.h" #include "unicode/uniset.h" @@ -145,6 +146,10 @@ inline UBool NamePrepTransform::isLDHChar(UChar32 ch){ return FALSE; } +#endif /* #if !UCONFIG_NO_TRANSLITERATION */ +#else +class NamePrepTransform { +}; #endif /* #if !UCONFIG_NO_IDNA */ #endif diff --git a/icu4c/source/test/intltest/testidn.cpp b/icu4c/source/test/intltest/testidn.cpp index 74559033315..698aa1adfdc 100644 --- a/icu4c/source/test/intltest/testidn.cpp +++ b/icu4c/source/test/intltest/testidn.cpp @@ -23,7 +23,7 @@ #include #include "unicode/utypes.h" -#if !UCONFIG_NO_IDNA +#if !UCONFIG_NO_IDNA && !UCONFIG_NO_TRANSLITERATION #include "unicode/uchar.h" #include "unicode/putil.h" diff --git a/icu4c/source/test/intltest/testidna.cpp b/icu4c/source/test/intltest/testidna.cpp index 4921180fb44..5fb5c823531 100644 --- a/icu4c/source/test/intltest/testidna.cpp +++ b/icu4c/source/test/intltest/testidna.cpp @@ -16,7 +16,7 @@ #include "unicode/utypes.h" -#if !UCONFIG_NO_IDNA +#if !UCONFIG_NO_IDNA && !UCONFIG_NO_TRANSLITERATION #include "unicode/uidna.h" #include diff --git a/icu4c/source/test/intltest/testidna.h b/icu4c/source/test/intltest/testidna.h index 1e7f55b7f9e..3bfe80706d7 100644 --- a/icu4c/source/test/intltest/testidna.h +++ b/icu4c/source/test/intltest/testidna.h @@ -19,7 +19,7 @@ #include "unicode/utypes.h" -#if !UCONFIG_NO_IDNA +#if !UCONFIG_NO_IDNA && !UCONFIG_NO_TRANSLITERATION #include "sprpimpl.h" #include "intltest.h" @@ -64,7 +64,6 @@ public: void TestRefIDNA(); void TestIDNAMonkeyTest(); void TestConformance(); - static NamePrepTransform* getInstance(UErrorCode& status); static NamePrepTransform* prep; private: