X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/f59164e3d128c7675a4d3934206346a3384e53a5..f3c0d7a59d99c2a94c6b8822291f0e42be3773c9:/icuSources/test/intltest/csdetest.cpp?ds=sidebyside diff --git a/icuSources/test/intltest/csdetest.cpp b/icuSources/test/intltest/csdetest.cpp index 316424c1..4edacad6 100644 --- a/icuSources/test/intltest/csdetest.cpp +++ b/icuSources/test/intltest/csdetest.cpp @@ -1,3 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html /* ********************************************************************** * Copyright (C) 2005-2016, International Business Machines @@ -816,7 +818,7 @@ void CharsetDetectionTest::Ticket6394Test() { // similar Windows and non-Windows SBCS encodings. State was kept in the shared // Charset Recognizer objects, and could be overwritten. void CharsetDetectionTest::Ticket6954Test() { -#if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_FORMATTING +#if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION && !UCONFIG_NO_FORMATTING UErrorCode status = U_ZERO_ERROR; UnicodeString sISO = "This is a small sample of some English text. Just enough to be sure that it detects correctly."; UnicodeString ssWindows("This is another small sample of some English text. Just enough to be sure that it detects correctly."