diff --git a/icu4c/source/i18n/csdetect.cpp b/icu4c/source/i18n/csdetect.cpp index 079dc6da8c6..36552c4b762 100644 --- a/icu4c/source/i18n/csdetect.cpp +++ b/icu4c/source/i18n/csdetect.cpp @@ -87,14 +87,10 @@ static void U_CALLCONV initRecognizers(UErrorCode &status) { CSRecognizerInfo *tempArray[] = { new CSRecognizerInfo(new CharsetRecog_UTF8(), TRUE), -#if !UCONFIG_ONLY_HTML_CONVERSION new CSRecognizerInfo(new CharsetRecog_UTF_16_BE(), TRUE), -#endif new CSRecognizerInfo(new CharsetRecog_UTF_16_LE(), TRUE), -#if !UCONFIG_ONLY_HTML_CONVERSION new CSRecognizerInfo(new CharsetRecog_UTF_32_BE(), TRUE), new CSRecognizerInfo(new CharsetRecog_UTF_32_LE(), TRUE), -#endif new CSRecognizerInfo(new CharsetRecog_8859_1(), TRUE), new CSRecognizerInfo(new CharsetRecog_8859_2(), TRUE), diff --git a/icu4c/source/i18n/csrucode.cpp b/icu4c/source/i18n/csrucode.cpp index 27384163b56..59f2dbe284c 100644 --- a/icu4c/source/i18n/csrucode.cpp +++ b/icu4c/source/i18n/csrucode.cpp @@ -21,7 +21,6 @@ CharsetRecog_Unicode::~CharsetRecog_Unicode() // nothing to do } -#if !UCONFIG_ONLY_HTML_CONVERSION CharsetRecog_UTF_16_BE::~CharsetRecog_UTF_16_BE() { // nothing to do @@ -31,7 +30,6 @@ const char *CharsetRecog_UTF_16_BE::getName() const { return "UTF-16BE"; } -#endif // UTF-16 confidence calculation. Very simple minded, but better than nothing. // Any 8 bit non-control characters bump the confidence up. These have a zero high byte, @@ -54,7 +52,6 @@ static int32_t adjustConfidence(UChar codeUnit, int32_t confidence) { } -#if !UCONFIG_ONLY_HTML_CONVERSION UBool CharsetRecog_UTF_16_BE::match(InputText* textIn, CharsetMatch *results) const { const uint8_t *input = textIn->fRawInput; @@ -79,7 +76,6 @@ UBool CharsetRecog_UTF_16_BE::match(InputText* textIn, CharsetMatch *results) co results->set(textIn, this, confidence); return (confidence > 0); } -#endif CharsetRecog_UTF_16_LE::~CharsetRecog_UTF_16_LE() { @@ -119,7 +115,6 @@ UBool CharsetRecog_UTF_16_LE::match(InputText* textIn, CharsetMatch *results) co return (confidence > 0); } -#if !UCONFIG_ONLY_HTML_CONVERSION CharsetRecog_UTF_32::~CharsetRecog_UTF_32() { // nothing to do @@ -199,7 +194,6 @@ int32_t CharsetRecog_UTF_32_LE::getChar(const uint8_t *input, int32_t index) con return input[index + 3] << 24 | input[index + 2] << 16 | input[index + 1] << 8 | input[index + 0]; } -#endif U_NAMESPACE_END #endif diff --git a/icu4c/source/i18n/csrucode.h b/icu4c/source/i18n/csrucode.h index 4d67e6042cc..cef35447fb7 100644 --- a/icu4c/source/i18n/csrucode.h +++ b/icu4c/source/i18n/csrucode.h @@ -42,7 +42,6 @@ public: }; -#if !UCONFIG_ONLY_HTML_CONVERSION class CharsetRecog_UTF_16_BE : public CharsetRecog_Unicode { public: @@ -53,7 +52,6 @@ public: UBool match(InputText* textIn, CharsetMatch *results) const; }; -#endif class CharsetRecog_UTF_16_LE : public CharsetRecog_Unicode { @@ -66,7 +64,6 @@ public: UBool match(InputText* textIn, CharsetMatch *results) const; }; -#if !UCONFIG_ONLY_HTML_CONVERSION class CharsetRecog_UTF_32 : public CharsetRecog_Unicode { protected: @@ -104,7 +101,6 @@ public: const char* getName() const; }; -#endif U_NAMESPACE_END