ICU-2248 modularize icu, allow parts to not be built

X-SVN-Rev: 9900

icu4c/source/common/brkdict.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "unicode/resbund.h"
 #include "brkdict.h"
 #include "cmemory.h"
@@ -236,3 +240,4 @@ BreakDictionary::internalAt(int32_t row, int32_t col) const
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */

icu4c/source/common/brkiter.cpp

@@ -18,6 +18,10 @@
 // This file was generated from the java source file BreakIterator.java
 // *****************************************************************************
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "unicode/dbbi.h"
 #include "unicode/brkiter.h"
 #include "unicode/udata.h"
@@ -265,4 +269,6 @@ BreakIterator::~BreakIterator()
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */
+
 //eof

icu4c/source/common/common.dsp

@@ -1771,6 +1771,53 @@ SOURCE=.\ucnvmbcs.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\unicode\uconfig.h
+
+!IF  "$(CFG)" == "common - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\unicode\uconfig.h
+
+"..\..\include\unicode\uconfig.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy    $(InputPath)    ..\..\include\unicode
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "common - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\unicode\uconfig.h
+
+"..\..\include\unicode\uconfig.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy    $(InputPath)    ..\..\include\unicode
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "common - Win64 Release"
+
+# Begin Custom Build
+InputPath=.\unicode\uconfig.h
+
+"..\..\include\unicode\uconfig.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy    $(InputPath)    ..\..\include\unicode
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "common - Win64 Debug"
+
+# Begin Custom Build
+InputPath=.\unicode\uconfig.h
+
+"..\..\include\unicode\uconfig.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy    $(InputPath)    ..\..\include\unicode
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\unicode\udata.h
 
 !IF  "$(CFG)" == "common - Win32 Release"

icu4c/source/common/dbbi.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "unicode/dbbi.h"
 #include "unicode/schriter.h"
 #include "dbbi_tbl.h"
@@ -583,5 +587,6 @@ DictionaryBasedBreakIterator::divideUpDictionaryRange(int32_t startPos, int32_t
 
 U_NAMESPACE_END
 
-/* eof */
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */
 
+/* eof */

icu4c/source/common/dbbi_tbl.cpp

@@ -9,6 +9,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "dbbi_tbl.h"
 #include "unicode/dbbi.h"
 #include "umutex.h"
@@ -52,4 +56,6 @@ DictionaryBasedBreakIteratorTables::~DictionaryBasedBreakIteratorTables() {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */
+
 /* eof */

icu4c/source/common/rbbi.cpp

@@ -10,6 +10,9 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
 
 #include "unicode/rbbi.h"
 #include "unicode/schriter.h"
@@ -1028,3 +1031,4 @@ UBool RuleBasedBreakIterator::isDictionaryChar(UChar32   c) {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */

icu4c/source/common/rbbidata.cpp

@@ -5,6 +5,10 @@
 ***************************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "unicode/utypes.h"
 #include "rbbidata.h"
 #include "rbbirb.h"
@@ -222,3 +226,5 @@ void  RBBIDataWrapper::printData() {
 
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */

icu4c/source/common/rbbinode.cpp

@@ -15,6 +15,10 @@
 //         Code using it is expected to directly access fields much of the time.
 //
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
 #include "unicode/uchar.h"
@@ -345,4 +349,4 @@ void RBBINode::printTree(UBool printHeading, UBool doVars) {
 
 U_NAMESPACE_END
 
-
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */

icu4c/source/common/rbbirb.cpp

@@ -9,6 +9,9 @@
 //    RBBI engine.
 //
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
 
 #include "unicode/brkiter.h"
 #include "unicode/rbbi.h"
@@ -243,3 +246,5 @@ RBBIRuleBuilder::createRuleBasedBreakIterator( const UnicodeString    &rules,
 }
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */

icu4c/source/common/rbbiscan.cpp

@@ -13,6 +13,9 @@
 //  create and use an instance of this class as part of the process.
 //
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
 
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
@@ -1086,3 +1089,4 @@ void RBBIRuleScanner::scanSet() {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */

icu4c/source/common/rbbisetb.cpp

@@ -28,6 +28,10 @@
 //                      the previous step.
 //
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "unicode/uniset.h"
 #include "utrie.h"
 #include "uvector.h"
@@ -577,3 +581,5 @@ void RangeDescriptor::setDictionaryFlag() {
 
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */

icu4c/source/common/rbbistbl.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
 #include "unicode/uchar.h"
@@ -263,3 +267,5 @@ void RBBISymbolTable::print() const {
 
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */

icu4c/source/common/rbbitblb.cpp

@@ -10,6 +10,9 @@
 */
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "unicode/unistr.h"
 #include "rbbitblb.h"
 #include "rbbirb.h"
@@ -749,3 +752,5 @@ RBBIStateDescriptor::~RBBIStateDescriptor() {
 }
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */

icu4c/source/common/ubrk.cpp

@@ -5,6 +5,10 @@
 *****************************************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "unicode/ubrk.h"
 
 #include "unicode/brkiter.h"
@@ -260,3 +264,5 @@ ubrk_getRuleStatus(UBreakIterator *bi)
 {
     return ((RuleBasedBreakIterator *)bi)->getRuleStatus();
 };
+
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */

icu4c/source/common/ucnv.c

@@ -1238,9 +1238,11 @@ U_CAPI UConverterType  U_EXPORT2
 ucnv_getType(const UConverter* converter)
 {
     int8_t type = converter->sharedData->staticData->conversionType;
+#if !UCONFIG_NO_LEGACY_CONVERSION
     if(type == UCNV_MBCS) {
         return _MBCSGetType(converter);
     }
+#endif
     return (UConverterType)type;
 }
 

icu4c/source/common/ucnv2022.c

@@ -27,6 +27,9 @@
 */
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_LEGACY_CONVERSION
+
 #include "unicode/ucnv.h"
 #include "unicode/ucnv_err.h"
 #include "unicode/ucnv_cb.h"
@@ -3395,4 +3398,4 @@ _ISO_2022_SafeClone(
     return &localClone->cnv;
 }
 
-
+#endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */

icu4c/source/common/ucnv_bld.c

@@ -45,12 +45,39 @@ extern void UCNV_DEBUG_LOG(char *what, char *who, void *p, int l);
 
 static const UConverterSharedData * const
 converterData[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES]={
-    NULL, NULL, &_MBCSData, &_Latin1Data,
+    NULL, NULL,
+
+#if UCONFIG_NO_LEGACY_CONVERSION
+    NULL,
+#else
+    &_MBCSData,
+#endif
+
+    &_Latin1Data,
     &_UTF8Data, &_UTF16BEData, &_UTF16LEData, &_UTF32BEData, &_UTF32LEData,
-    NULL, &_ISO2022Data, 
+    NULL,
+
+#if UCONFIG_NO_LEGACY_CONVERSION
+    NULL,
+    NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL,
+#else
+    &_ISO2022Data,
     &_LMBCSData1,&_LMBCSData2, &_LMBCSData3, &_LMBCSData4, &_LMBCSData5, &_LMBCSData6,
     &_LMBCSData8,&_LMBCSData11,&_LMBCSData16,&_LMBCSData17,&_LMBCSData18,&_LMBCSData19,
-    &_HZData, &_SCSUData, &_ISCIIData, &_ASCIIData,
+    &_HZData,
+#endif
+
+    &_SCSUData,
+
+#if UCONFIG_NO_LEGACY_CONVERSION
+    NULL,
+#else
+    &_ISCIIData,
+#endif
+
+    &_ASCIIData,
     &_UTF7Data, &_Bocu1Data, &_UTF16Data, &_UTF32Data, &_CESU8Data
 };
 
@@ -64,10 +91,13 @@ static struct {
 } const cnvNameType[] = {
   { "bocu1", UCNV_BOCU1 },
   { "cesu8", UCNV_CESU8 },
+#if !UCONFIG_NO_LEGACY_CONVERSION
   { "hz",UCNV_HZ },
   { "iscii", UCNV_ISCII },
   { "iso2022", UCNV_ISO_2022 },
+#endif
   { "iso88591", UCNV_LATIN_1 },
+#if !UCONFIG_NO_LEGACY_CONVERSION
   { "lmbcs1", UCNV_LMBCS_1 },
   { "lmbcs11",UCNV_LMBCS_11 },
   { "lmbcs16",UCNV_LMBCS_16 },
@@ -80,6 +110,7 @@ static struct {
   { "lmbcs5", UCNV_LMBCS_5 },
   { "lmbcs6", UCNV_LMBCS_6 },
   { "lmbcs8", UCNV_LMBCS_8 },
+#endif
   { "scsu", UCNV_SCSU },
   { "usascii", UCNV_US_ASCII },
   { "utf16", UCNV_UTF16 },

icu4c/source/common/ucnv_lmb.c

@@ -24,6 +24,9 @@
 */
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_LEGACY_CONVERSION
+
 #include "cmemory.h"
 #include "unicode/ucnv_err.h"
 #include "ucnv_bld.h"
@@ -1344,6 +1347,4 @@ DECLARE_LMBCS_DATA(17)
 DECLARE_LMBCS_DATA(18)
 DECLARE_LMBCS_DATA(19)
 
-
+#endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */
-
-

icu4c/source/common/ucnvhz.c

@@ -15,6 +15,9 @@
 */
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_LEGACY_CONVERSION
+
 #include "cmemory.h"
 #include "unicode/ucnv_err.h"
 #include "ucnv_bld.h"
@@ -682,3 +685,4 @@ const UConverterSharedData _HZData={
         0
 };
 
+#endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */

icu4c/source/common/ucnvisci.c

@@ -16,6 +16,9 @@
 */
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_LEGACY_CONVERSION
+
 #include "cmemory.h"
 #include "unicode/ucnv_err.h"
 #include "ucnv_bld.h"
@@ -1488,3 +1491,4 @@ const UConverterSharedData _ISCIIData={
         0
 };
 
+#endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */

icu4c/source/common/ucnvmbcs.c

@@ -37,6 +37,9 @@
 */
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_LEGACY_CONVERSION
+
 #include "unicode/ucnv.h"
 #include "unicode/ucnv_cb.h"
 #include "unicode/udata.h"
@@ -3625,3 +3628,5 @@ toUCallback(UConverter *cnv,
     /* call the normal callback function */
     cnv->fromCharErrorBehaviour(context, pArgs, codeUnits, length, reason, pErrorCode);
 }
+
+#endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */

icu4c/source/common/unicode/brkiter.h

@@ -21,6 +21,17 @@
 #define BRKITER_H
 
 #include "unicode/utypes.h"
+
+#if UCONFIG_NO_BREAK_ITERATION
+
+/*
+ * Allow the declaration of APIs with pointers to BreakIterator
+ * even when break iteration is removed from the build.
+ */
+class BreakIterator;
+
+#else
+
 #include "unicode/uobject.h"
 #include "unicode/unistr.h"
 #include "unicode/chariter.h"
@@ -518,6 +529,8 @@ inline UBool BreakIterator::isBufferClone()
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */
+
 #endif // _BRKITER
 //eof
 

icu4c/source/common/unicode/dbbi.h

@@ -13,6 +13,8 @@
 
 #include "unicode/rbbi.h"
 
+#if !UCONFIG_NO_BREAK_ITERATION
+
 U_NAMESPACE_BEGIN
 
 /* forward declaration */
@@ -253,4 +255,6 @@ inline UClassID DictionaryBasedBreakIterator::getStaticClassID(void) {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */
+
 #endif

icu4c/source/common/unicode/ubrk.h

@@ -7,6 +7,18 @@
 #define UBRK_H
 
 #include "unicode/utypes.h"
+
+/**
+ * A text-break iterator.
+ *  For usage in C programs.
+ */
+#ifndef UBRK_TYPEDEF_UBREAK_ITERATOR
+#   define UBRK_TYPEDEF_UBREAK_ITERATOR
+    typedef void UBreakIterator;
+#endif
+
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "unicode/parseerr.h"
 
 /**
@@ -166,15 +178,6 @@
  * </pre>
  */
 
-/**
- * A text-break iterator.
- *  For usage in C programs.
- */
-#ifndef UBRK_TYPEDEF_UBREAK_ITERATOR
-#   define UBRK_TYPEDEF_UBREAK_ITERATOR
-    typedef void UBreakIterator;
-#endif
-
 /** The possible types of text boundaries. */
 typedef enum UBreakIteratorType {
   /** Character breaks */
@@ -453,5 +456,6 @@ ubrk_isBoundary(UBreakIterator *bi, int32_t offset);
 U_CAPI  int32_t U_EXPORT2
 ubrk_getRuleStatus(UBreakIterator *bi);
 
+#endif /* #if !UCONFIG_NO_BREAK_ITERATION */
 
 #endif

icu4c/source/common/unicode/uconfig.h

@@ -0,0 +1,111 @@
+/*  
+**********************************************************************
+*   Copyright (C) 2002, International Business Machines
+*   Corporation and others.  All Rights Reserved.
+**********************************************************************
+*   file name:  uconfig.h
+*   encoding:   US-ASCII
+*   tab size:   8 (not used)
+*   indentation:4
+*
+*   created on: 2002sep19
+*   created by: Markus W. Scherer
+*/
+
+#ifndef __UCONFIG_H__
+#define __UCONFIG_H__
+
+/*!
+ * \file
+ * \brief Switches for excluding parts of ICU library code modules.
+ *
+ * Allows to build partial, smaller libraries for special purposes.
+ * By default, all modules are built.
+ * The switches are fairly coarse, controlling large modules.
+ * Basic services cannot be turned off.
+ *
+ * @draft ICU 2.4
+ */
+
+/**
+ * \def UCONFIG_ONLY_COLLATION
+ * This switch turns off modules that are not needed for collation.
+ *
+ * @draft ICU 2.4
+ */
+#ifndef UCONFIG_ONLY_COLLATION
+#   define UCONFIG_ONLY_COLLATION 0
+#endif
+
+#if UCONFIG_ONLY_COLLATION
+    /* common library */
+#   define UCONFIG_NO_LEGACY_CONVERSION 1
+#   define UCONFIG_NO_BREAK_ITERATION 1
+
+    /* i18n library */
+#   if UCONFIG_NO_COLLATION
+#       error Contradictory collation switches in uconfig.h.
+#   endif
+#   define UCONFIG_NO_FORMATTING 1
+#   define UCONFIG_NO_TRANSLITERATION 1
+#endif
+
+/* common library switches -------------------------------------------------- */
+
+/**
+ * \def UCONFIG_NO_LEGACY_CONVERSION
+ * This switch turns off all converters except for
+ * - Unicode charsets (UTF-7/8/16/32, CESU-8, SCSU, BOCU-1)
+ * - US-ASCII
+ * - ISO-8859-1
+ *
+ * @draft ICU 2.4
+ */
+#ifndef UCONFIG_NO_LEGACY_CONVERSION
+#   define UCONFIG_NO_LEGACY_CONVERSION 0
+#endif
+
+/**
+ * \def UCONFIG_NO_BREAK_ITERATION
+ * This switch turns off break iteration.
+ *
+ * @draft ICU 2.4
+ */
+#ifndef UCONFIG_NO_BREAK_ITERATION
+#   define UCONFIG_NO_BREAK_ITERATION 0
+#endif
+
+/* i18n library switches ---------------------------------------------------- */
+
+/**
+ * \def 
+ * This switch turns off collation and collation-based string search.
+ *
+ * @draft ICU 2.4
+ */
+#ifndef UCONFIG_NO_COLLATION
+#   define UCONFIG_NO_COLLATION 0
+#endif
+
+/**
+ * \def UCONFIG_NO_FORMATTING
+ * This switch turns off formatting and calendar/timezone services.
+ *
+ * @draft ICU 2.4
+ */
+#ifndef UCONFIG_NO_FORMATTING
+#   define UCONFIG_NO_FORMATTING 0
+#endif
+
+/**
+ * \def UCONFIG_NO_TRANSLITERATION
+ * This switch turns off transliteration.
+ *
+ * @draft ICU 2.4
+ */
+#ifndef UCONFIG_NO_TRANSLITERATION
+#   define UCONFIG_NO_TRANSLITERATION 0
+#endif
+
+
+#endif

icu4c/source/common/unicode/unistr.h

@@ -2352,6 +2352,8 @@ public:
    */
   UnicodeString& toLower(const Locale& locale);
 
+#if !UCONFIG_NO_BREAK_ITERATION
+
   /**
    * Titlecase this string, convenience function using the default locale.
    *
@@ -2407,6 +2409,8 @@ public:
    */
   UnicodeString &toTitle(BreakIterator *titleIter, const Locale &locale);
 
+#endif
+
   /**
    * Case-fold the characters in this string.
    * Case-folding is locale-independent and not context-sensitive,

icu4c/source/common/unicode/ustring.h

@@ -840,6 +840,8 @@ u_strToLower(UChar *dest, int32_t destCapacity,
              const char *locale,
              UErrorCode *pErrorCode);
 
+#if !UCONFIG_NO_BREAK_ITERATION
+
 /**
  * Titlecase a string.
  * Casing is locale-dependent and context-sensitive.
@@ -885,6 +887,8 @@ u_strToTitle(UChar *dest, int32_t destCapacity,
              const char *locale,
              UErrorCode *pErrorCode);
 
+#endif
+
 /**
  * Case-fold the characters in a string.
  * Case-folding is locale-independent and not context-sensitive,

icu4c/source/common/unicode/utypes.h

@@ -36,6 +36,7 @@
 #include "unicode/umachine.h"
 #include "unicode/utf.h"
 #include "unicode/uversion.h"
+#include "unicode/uconfig.h"
 
 /*!
  * \file

icu4c/source/common/unistr.cpp

@@ -1134,6 +1134,8 @@ UnicodeString::toUpper(const Locale &locale) {
   return caseMap(0, locale, 0, TO_UPPER);
 }
 
+#if !UCONFIG_NO_BREAK_ITERATION
+
 UnicodeString &
 UnicodeString::toTitle(BreakIterator *titleIter) {
   return caseMap(titleIter, Locale::getDefault(), 0, TO_TITLE);
@@ -1144,6 +1146,8 @@ UnicodeString::toTitle(BreakIterator *titleIter, const Locale &locale) {
   return caseMap(titleIter, locale, 0, TO_TITLE);
 }
 
+#endif
+
 UnicodeString &
 UnicodeString::foldCase(uint32_t options) {
     return caseMap(0, Locale::getDefault(), options, FOLD_CASE);
@@ -1182,9 +1186,11 @@ UnicodeString::caseMap(BreakIterator *titleIter,
     return *this;
   }
 
+  UErrorCode errorCode;
+
+#if !UCONFIG_NO_BREAK_ITERATION
   // set up the titlecasing break iterator
   UBreakIterator *cTitleIter = 0;
-  UErrorCode errorCode;
 
   if(toWhichCase == TO_TITLE) {
     if(titleIter != 0) {
@@ -1201,6 +1207,7 @@ UnicodeString::caseMap(BreakIterator *titleIter,
       }
     }
   }
+#endif
 
   // Case-map, and if the result is too long, then reallocate and repeat.
   do {
@@ -1216,11 +1223,13 @@ UnicodeString::caseMap(BreakIterator *titleIter,
                                      oldArray, oldLength,
                                      locale.getName(),
                                      &errorCode);
+#if !UCONFIG_NO_BREAK_ITERATION
     } else if(toWhichCase==TO_TITLE) {
       fLength = u_internalStrToTitle(fArray, fCapacity,
                                      oldArray, oldLength,
                                      cTitleIter, locale.getName(),
                                      &errorCode);
+#endif
     } else {
       fLength = u_internalStrFoldCase(fArray, fCapacity,
                                       oldArray, oldLength,
@@ -1229,9 +1238,11 @@ UnicodeString::caseMap(BreakIterator *titleIter,
     }
   } while(errorCode==U_BUFFER_OVERFLOW_ERROR && cloneArrayIfNeeded(fLength, fLength, FALSE));
 
+#if !UCONFIG_NO_BREAK_ITERATION
   if(cTitleIter != 0 && titleIter == 0) {
     ubrk_close(cTitleIter);
   }
+#endif
 
   if (bufferToDelete) {
     uprv_free(bufferToDelete);

icu4c/source/common/ustr_imp.h

@@ -109,6 +109,8 @@ u_internalStrToUpper(UChar *dest, int32_t destCapacity,
                      const char *locale,
                      UErrorCode *pErrorCode);
 
+#if !UCONFIG_NO_BREAK_ITERATION
+
 /**
  * @internal
  */
@@ -119,6 +121,8 @@ u_internalStrToTitle(UChar *dest, int32_t destCapacity,
                      const char *locale,
                      UErrorCode *pErrorCode);
 
+#endif
+
 /**
  * Internal case folding function.
  * @internal

icu4c/source/common/ustrcase.c

@@ -27,6 +27,8 @@
 
 /* string casing ------------------------------------------------------------ */
 
+#if !UCONFIG_NO_BREAK_ITERATION
+
 /*
  * Internal titlecasing function,
  * using u_internalStrToLower() and u_internalToTitle().
@@ -106,6 +108,8 @@ u_internalStrToTitle(UChar *dest, int32_t destCapacity,
     return destIndex;
 }
 
+#endif
+
 /*
  * Implement argument checking and buffer handling
  * for string case mapping as a common function.
@@ -180,6 +184,7 @@ u_strCaseMap(UChar *dest, int32_t destCapacity,
     } else if(toWhichCase==TO_UPPER) {
         destLength=u_internalStrToUpper(temp, destCapacity, src, srcLength,
                                         locale, pErrorCode);
+#if !UCONFIG_NO_BREAK_ITERATION
     } else if(toWhichCase==TO_TITLE) {
         if(titleIter==NULL) {
             titleIter=ubrk_open(UBRK_TITLE, locale,
@@ -191,6 +196,7 @@ u_strCaseMap(UChar *dest, int32_t destCapacity,
             destLength=u_internalStrToTitle(temp, destCapacity, src, srcLength,
                                             titleIter, locale, pErrorCode);
         }
+#endif
     } else {
         destLength=u_internalStrFoldCase(temp, destCapacity, src, srcLength,
                                          options, pErrorCode);
@@ -208,9 +214,11 @@ u_strCaseMap(UChar *dest, int32_t destCapacity,
         }
     }
 
+#if !UCONFIG_NO_BREAK_ITERATION
     if(ownTitleIter) {
         ubrk_close(titleIter);
     }
+#endif
 
     return u_terminateUChars(dest, destCapacity, destLength, pErrorCode);
 }

icu4c/source/i18n/anytrans.cpp

@@ -9,6 +9,9 @@
 */
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/uobject.h"
 #include "unicode/nultrans.h"
 #include "unicode/uscript.h"
@@ -385,4 +388,6 @@ void AnyTransliterator::registerIDs() {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 //eof

icu4c/source/i18n/anytrans.h

@@ -4,7 +4,7 @@
 * and others.  All Rights Reserved.
 *****************************************************************
 * $Source: /xsrl/Nsvn/icu/icu/source/i18n/anytrans.h,v $ 
-* $Revision: 1.3 $
+* $Revision: 1.4 $
 *****************************************************************
 * Date        Name        Description
 * 06/06/2002  aliu        Creation.
@@ -13,6 +13,10 @@
 #ifndef _ANYTRANS_H_
 #define _ANYTRANS_H_
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/translit.h"
 #include "unicode/uscript.h"
 #include "uhash.h"
@@ -139,4 +143,6 @@ private:
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/bocsu.c

@@ -15,6 +15,10 @@
 */
 
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_COLLATION
+
 #include "bocsu.h"
 
 /*
@@ -167,3 +171,4 @@ u_lengthOfIdenticalLevelRun(const UChar *s, int32_t length) {
     return runLength;
 }
 
+#endif /* #if !UCONFIG_NO_COLLATION */

icu4c/source/i18n/bocsu.h

@@ -17,6 +17,10 @@
 #ifndef BOCSU_H
 #define BOCSU_H
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_COLLATION
+
 /*
  * "BOCSU"
  * Binary Ordered Compression Scheme for Unicode
@@ -71,8 +75,6 @@
  * same-script text runs.
  */
 
-#include "unicode/utypes.h"
-
 /* Do not use byte values 0, 1, 2 because they are separators in sort keys. */
 #define SLOPE_MIN           3
 #define SLOPE_MAX           0xff
@@ -152,5 +154,6 @@ u_lengthOfIdenticalLevelRun(const UChar *s, int32_t length);
 U_CFUNC uint8_t *
 u_writeDiff(int32_t diff, uint8_t *p);
 
+#endif /* #if !UCONFIG_NO_COLLATION */
 
 #endif

icu4c/source/i18n/calendar.cpp

@@ -24,6 +24,10 @@
 *******************************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/resbund.h"
 #include "unicode/gregocal.h"
 #include "unicode/calendar.h"
@@ -849,4 +853,6 @@ Calendar::updateTime(UErrorCode& status)
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/choicfmt.cpp

@@ -23,6 +23,10 @@
 ********************************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/choicfmt.h"
 #include "unicode/numfmt.h"
 #include "unicode/locid.h"
@@ -705,4 +709,6 @@ ChoiceFormat::nextDouble( double d, UBool positive )
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/coleitr.cpp

@@ -24,6 +24,10 @@
 *                        private constructor and no calls are made to it
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_COLLATION
+
 #include "unicode/coleitr.h"
 #include "unicode/ustring.h"
 #include "ucol_imp.h"
@@ -486,4 +490,6 @@ const CollationElementIterator& CollationElementIterator::operator=(
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_COLLATION */
+
 /* eof */

icu4c/source/i18n/coll.cpp

@@ -37,6 +37,10 @@
 * 01/29/01     synwee      Modified into a C++ wrapper calling C APIs (ucol.h)
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_COLLATION
+
 #include "unicode/coll.h"
 #include "unicode/tblcoll.h"
 #include "cmemory.h"
@@ -224,4 +228,6 @@ int32_t Collator::getBound(const uint8_t       *source,
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_COLLATION */
+
 /* eof */

icu4c/source/i18n/cpdtrans.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 /* These APIs are becoming private */
 #define ICU_COMPOUNDTRANSLITERATOR_USE_DEPRECATES 1
 
@@ -553,4 +557,6 @@ void CompoundTransliterator::computeMaximumContextLength(void) {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 /* eof */

icu4c/source/i18n/datefmt.cpp

@@ -17,6 +17,10 @@
 ********************************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/resbund.h"
 #include "unicode/datefmt.h"
 #include "unicode/smpdtfmt.h"
@@ -366,4 +370,6 @@ DateFormat::isLenient() const
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/dcfmtsym.cpp

@@ -17,6 +17,10 @@
 ********************************************************************************
 */
  
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/dcfmtsym.h"
 #include "unicode/resbund.h"
 #include "unicode/decimfmt.h"
@@ -228,4 +232,6 @@ DecimalFormatSymbols::initialize() {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/decimfmt.cpp

@@ -37,6 +37,10 @@
 ********************************************************************************
 */
  
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/decimfmt.h"
 #include "unicode/ucurr.h"
 #include "unicode/ustring.h"
@@ -3034,4 +3038,6 @@ const UChar* DecimalFormat::getCurrency() const {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/dtfmtsym.cpp

@@ -18,6 +18,10 @@
 *******************************************************************************
 */
  
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/dtfmtsym.h"
 #include "unicode/resbund.h"
 #include "unicode/smpdtfmt.h"
@@ -700,4 +704,6 @@ int32_t DateFormatSymbols::_getZoneIndex(const UnicodeString& ID) const
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/esctrn.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "esctrn.h"
 #include "util.h"
 
@@ -167,4 +171,6 @@ void EscapeTransliterator::handleTransliterate(Replaceable& text, UTransPosition
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 //eof

icu4c/source/i18n/esctrn.h

@@ -10,6 +10,10 @@
 #ifndef ESCTRN_H
 #define ESCTRN_H
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/translit.h"
 
 U_NAMESPACE_BEGIN
@@ -154,4 +158,6 @@ class U_I18N_API EscapeTransliterator : public Transliterator {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/fmtable.cpp

@@ -12,6 +12,11 @@
 *   03/25/97    clhuang     Initial Implementation.
 ********************************************************************************
 */
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/fmtable.h"
 #include "cmemory.h"
 
@@ -374,4 +379,6 @@ FormattableStreamer::streamOut(ostream& stream, const Formattable& obj)
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/format.cpp

@@ -19,6 +19,10 @@
 // This file was generated from the java source file Format.java
 // *****************************************************************************
  
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/format.h"
 
 // *****************************************************************************
@@ -108,4 +112,6 @@ Format::operator==(const Format& /*that*/) const
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/funcrepl.cpp

@@ -7,6 +7,11 @@
 *   02/04/2002  aliu        Creation.
 **********************************************************************
 */
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/translit.h"
 #include "unicode/uniset.h"
 #include "funcrepl.h"
@@ -111,4 +116,6 @@ void FunctionReplacer::setData(const TransliterationRuleData* d) {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 //eof

icu4c/source/i18n/funcrepl.h

@@ -7,6 +7,11 @@
 *   02/04/2002  aliu        Creation.
 **********************************************************************
 */
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/unifunct.h"
 #include "unicode/unirepl.h"
 
@@ -114,4 +119,6 @@ class FunctionReplacer : public UnicodeFunctor, public UnicodeReplacer {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 //eof

icu4c/source/i18n/gregocal.cpp

@@ -37,6 +37,10 @@
 ********************************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/gregocal.h"
 
 // *****************************************************************************
@@ -2007,4 +2011,6 @@ GregorianCalendar::internalGetEra() const {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/hextouni.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 /* These APIs are becoming private */
 #define ICU_HEXTOUNICODETRANSLITERATOR_USE_DEPRECATES 1
 
@@ -372,3 +376,4 @@ void HexToUnicodeTransliterator::handleTransliterate(Replaceable& text, UTransPo
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/i18n.dsp

@@ -525,10 +525,6 @@ InputPath=.\unicode\choicfmt.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\colcache.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\unicode\coleitr.h
 
 !IF  "$(CFG)" == "i18n - Win32 Release"
@@ -2098,6 +2094,10 @@ InputPath=.\unicode\umsg.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\umsg_imp.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\unesctrn.h
 # End Source File
 # Begin Source File
@@ -2294,10 +2294,6 @@ InputPath=.\unicode\unum.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\upropset.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\unicode\usearch.h
 
 !IF  "$(CFG)" == "i18n - Win32 Release"

icu4c/source/i18n/msgfmt.cpp

@@ -19,6 +19,10 @@
 ********************************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/msgfmt.h"
 #include "unicode/decimfmt.h"
 #include "unicode/datefmt.h"
@@ -1431,4 +1435,6 @@ MessageFormat::createIntegerFormat(const Locale& locale, UErrorCode& status) con
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/name2uni.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/unifilt.h"
 #include "unicode/uchar.h"
 #include "unicode/uniset.h"
@@ -216,3 +220,4 @@ void NameUnicodeTransliterator::handleTransliterate(Replaceable& text, UTransPos
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/name2uni.h

@@ -10,6 +10,10 @@
 #ifndef NAME2UNI_H
 #define NAME2UNI_H
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/translit.h"
 
 U_NAMESPACE_BEGIN
@@ -98,4 +102,6 @@ class U_I18N_API NameUnicodeTransliterator : public Transliterator {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/nfrlist.h

@@ -16,7 +16,10 @@
 #ifndef NFRLIST_H
 #define NFRLIST_H
 
-#include "unicode/utypes.h"
+#include "unicode/rbnf.h"
+
+#if U_HAVE_RBNF
+
 #include "unicode/uobject.h"
 #include "nfrule.h"
 
@@ -97,5 +100,8 @@ private:
 
 U_NAMESPACE_END
 
+/* U_HAVE_RBNF */
+#endif
+
 // NFRLIST_H
 #endif

icu4c/source/i18n/nfrs.h

@@ -16,7 +16,6 @@
 #ifndef NFRS_H
 #define NFRS_H
 
-#include "unicode/utypes.h"
 #include "unicode/uobject.h"
 #include "unicode/rbnf.h"
 

icu4c/source/i18n/nfrule.cpp

@@ -1016,7 +1016,12 @@ NFRule::matchToDelimiter(const UnicodeString& text,
             subText.setTo(text, 0, dPos);
             if (subText.length() > 0) {
                 UBool success = sub->doParse(subText, tempPP, _baseValue, upperBound,
-                    formatter->isLenient(), result);
+#if UCONFIG_NO_COLLATION
+                    FALSE,
+#else
+                    formatter->isLenient(),
+#endif
+                    result);
 
                 // if the substitution could match all the text up to
                 // where we found "delimiter", then this function has
@@ -1060,7 +1065,12 @@ NFRule::matchToDelimiter(const UnicodeString& text,
 
         // try to match the whole string against the substitution
         UBool success = sub->doParse(text, tempPP, _baseValue, upperBound,
-            formatter->isLenient(), result);
+#if UCONFIG_NO_COLLATION
+            FALSE,
+#else
+            formatter->isLenient(),
+#endif
+            result);
         if (success && (tempPP.getIndex() != 0 || sub->isNullSubstitution())) {
             // if there's a successful match (or it's a null
             // substitution), update pp to point to the first
@@ -1104,6 +1114,7 @@ NFRule::prefixLength(const UnicodeString& str, const UnicodeString& prefix) cons
         return 0;
     }
 
+#if !UCONFIG_NO_COLLATION
     // go through all this grief if we're in lenient-parse mode
     if (formatter->isLenient()) {
         // get the formatter's collator and use it to create two
@@ -1251,7 +1262,9 @@ NFRule::prefixLength(const UnicodeString& str, const UnicodeString& prefix) cons
 
         // If lenient parsing is turned off, forget all that crap above.
         // Just use String.startsWith() and be done with it.
-  } else {
+  } else
+#endif
+  {
       if (str.startsWith(prefix)) {
           return prefix.length();
       } else {
@@ -1281,6 +1294,7 @@ NFRule::findText(const UnicodeString& str,
                  int32_t startingAt,
                  int32_t* length) const
 {
+#if !UCONFIG_NO_COLLATION
     // if lenient parsing is turned off, this is easy: just call
     // String.indexOf() and we're done
     if (!formatter->isLenient()) {
@@ -1289,7 +1303,9 @@ NFRule::findText(const UnicodeString& str,
 
         // but if lenient parsing is turned ON, we've got some work
         // ahead of us
-    } else {
+    } else
+#endif
+    {
         //----------------------------------------------------------------
         // JDK 1.1 HACK (take out of 1.2-specific code)
 
@@ -1393,6 +1409,7 @@ NFRule::allIgnorable(const UnicodeString& str) const
         return TRUE;
     }
 
+#if !UCONFIG_NO_COLLATION
     // if lenient parsing is turned on, walk through the string with
     // a collation element iterator and make sure each collation
     // element is 0 (ignorable) at the primary level
@@ -1410,6 +1427,8 @@ NFRule::allIgnorable(const UnicodeString& str) const
         delete iter;
         return o == CollationElementIterator::NULLORDER;
     }
+#endif
+
     // if lenient parsing is turned off, there is no such thing as
     // an ignorable character: return true only if the string is empty
     return FALSE;

icu4c/source/i18n/nortrans.cpp

@@ -9,6 +9,9 @@
 */
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/uniset.h"
 #include "unicode/uiter.h"
 #include "nortrans.h"
@@ -640,3 +643,5 @@ void NormalizationTransliterator::cleanup() {
 }
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/nortrans.h

@@ -11,6 +11,9 @@
 #define NORTRANS_H
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/translit.h"
 #include "unicode/normlzr.h"
 
@@ -123,4 +126,6 @@ class U_I18N_API NormalizationTransliterator : public Transliterator {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/nultrans.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 /* These APIs are becoming private */
 #define ICU_NULLTRANSLITERATOR_USE_DEPRECATES 1
 
@@ -34,3 +38,4 @@ void NullTransliterator::handleTransliterate(Replaceable& /*text*/, UTransPositi
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/numfmt.cpp

@@ -22,6 +22,10 @@
 ********************************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/numfmt.h"
 #include "unicode/locid.h"
 #include "unicode/resbund.h"
@@ -501,4 +505,6 @@ NumberFormat::createInstance(const Locale& desiredLocale,
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/quant.cpp

@@ -6,6 +6,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "quant.h"
 #include "unicode/unistr.h"
 #include "util.h"
@@ -134,4 +138,6 @@ void Quantifier::setData(const TransliterationRuleData* d) {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 //eof

icu4c/source/i18n/quant.h

@@ -8,6 +8,10 @@
 #ifndef QUANT_H
 #define QUANT_H
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/unifunct.h"
 #include "unicode/unimatch.h"
 
@@ -125,4 +129,6 @@ class Quantifier : public UnicodeFunctor, public UnicodeMatcher {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/rbnf.cpp

@@ -366,6 +366,8 @@ RuleBasedNumberFormat::parse(const UnicodeString& text,
     }
 }
 
+#if !UCONFIG_NO_COLLATION
+
 void
 RuleBasedNumberFormat::setLenient(UBool enabled)
 {
@@ -376,6 +378,8 @@ RuleBasedNumberFormat::setLenient(UBool enabled)
     }
 }
 
+#endif
+
 void 
 RuleBasedNumberFormat::setDefaultRuleSet(const UnicodeString& ruleSetName, UErrorCode& status) {
     if (U_SUCCESS(status)) {
@@ -600,7 +604,9 @@ RuleBasedNumberFormat::dispose()
         ruleSets = NULL;
     }
 
+#if !UCONFIG_NO_COLLATION
     delete collator;
+#endif
     collator = NULL;
 
     delete decimalFormatSymbols;
@@ -624,6 +630,7 @@ RuleBasedNumberFormat::dispose()
 Collator*
 RuleBasedNumberFormat::getCollator() const
 {
+#if !UCONFIG_NO_COLLATION
     // lazy-evaulate the collator
     if (collator == NULL && lenient) {
         // create a default collator based on the formatter's locale,
@@ -656,6 +663,7 @@ RuleBasedNumberFormat::getCollator() const
         }
         delete temp;
     }
+#endif
 
     // if lenient-parse mode is off, this will be null
     // (see setLenientParseMode())

icu4c/source/i18n/rbt.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 /* These APIs are becoming private */
 #define ICU_RULEBASEDTRANSLITERATOR_USE_DEPRECATES 1
 
@@ -172,3 +176,4 @@ UnicodeSet& RuleBasedTransliterator::getTargetSet(UnicodeSet& result) const {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/rbt_data.cpp

@@ -7,6 +7,11 @@
 *   11/17/99    aliu        Creation.
 **********************************************************************
 */
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
 #include "rbt_data.h"
@@ -101,3 +106,5 @@ TransliterationRuleData::lookupReplacer(UChar32 standIn) const {
 }
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/rbt_data.h

@@ -9,6 +9,9 @@
 #define RBT_DATA_H
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/uobject.h"
 #include "rbt_set.h"
 
@@ -151,4 +154,6 @@ private:
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/rbt_pars.cpp

@@ -9,6 +9,9 @@
 */
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/uobject.h"
 #include "unicode/parseerr.h"
 #include "unicode/parsepos.h"
@@ -1557,3 +1560,5 @@ Transliterator* TransliteratorParser::createBasicInstance(const UnicodeString& i
 }
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/rbt_pars.h

@@ -9,6 +9,9 @@
 #define RBT_PARS_H
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/uobject.h"
 #include "unicode/rbt.h"
 #include "unicode/parseerr.h"
@@ -361,4 +364,6 @@ private:
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/rbt_rule.cpp

@@ -7,6 +7,11 @@
 *   11/17/99    aliu        Creation.
 **********************************************************************
 */
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/rep.h"
 #include "unicode/unifilt.h"
 #include "unicode/uniset.h"
@@ -546,4 +551,6 @@ void TransliterationRule::addTargetSetTo(UnicodeSet& toUnionTo) const {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 //eof

icu4c/source/i18n/rbt_rule.h

@@ -9,6 +9,9 @@
 #define RBT_RULE_H
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/uobject.h"
 #include "unicode/unistr.h"
 #include "unicode/utrans.h"
@@ -318,4 +321,6 @@ public:
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/rbt_set.cpp

@@ -7,6 +7,11 @@
 *   11/17/99    aliu        Creation.
 **********************************************************************
 */
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
 #include "rbt_set.h"
@@ -446,3 +451,5 @@ UnicodeSet& TransliterationRuleSet::getSourceTargetSet(UnicodeSet& result,
 }
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/rbt_set.h

@@ -9,6 +9,9 @@
 #define RBT_SET_H
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/uobject.h"
 #include "unicode/utrans.h"
 #include "uvector.h"
@@ -172,4 +175,7 @@ private:
 };
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/remtrans.cpp

@@ -7,6 +7,11 @@
 *   04/02/2001  aliu        Creation.
 **********************************************************************
 */
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "remtrans.h"
 
 static const UChar ID[] = {65, 110, 121, 45, 0x52, 0x65, 0x6D, 0x6F, 0x76, 0x65, 0x00}; /* "Any-Remove" */
@@ -54,3 +59,4 @@ void RemoveTransliterator::handleTransliterate(Replaceable& text, UTransPosition
 }
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/remtrans.h

@@ -10,6 +10,10 @@
 #ifndef REMTRANS_H
 #define REMTRANS_H
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/translit.h"
 
 U_NAMESPACE_BEGIN
@@ -85,4 +89,6 @@ public:
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/search.cpp

@@ -7,6 +7,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_COLLATION
+
 #include "unicode/brkiter.h"
 #include "unicode/schriter.h"
 #include "unicode/search.h"
@@ -384,3 +388,5 @@ void SearchIterator::setMatchNotFound()
 
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_COLLATION */

icu4c/source/i18n/simpletz.cpp

@@ -21,6 +21,10 @@
 ********************************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/simpletz.h"
 #include "unicode/gregocal.h"
 #include "tzdat.h"
@@ -925,4 +929,6 @@ SimpleTimeZone::decodeEndRule(UErrorCode& status)
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/smpdtfmt.cpp

@@ -24,6 +24,10 @@
 ********************************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/smpdtfmt.h"
 #include "unicode/dtfmtsym.h"
 #include "unicode/resbund.h"
@@ -1597,4 +1601,6 @@ SimpleDateFormat::initializeSystemDefaultCentury()
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/sortkey.cpp

@@ -27,6 +27,10 @@
 //                             than the other
 //===============================================================================
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_COLLATION
+
 #include "unicode/sortkey.h"
 #include "cmemory.h"
 #include "uhash.h"
@@ -337,3 +341,5 @@ CollationKey::hashCode() const
 }
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_COLLATION */

icu4c/source/i18n/strmatch.cpp

@@ -6,6 +6,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "strmatch.h"
 #include "rbt_data.h"
 #include "util.h"
@@ -276,4 +280,6 @@ void StringMatcher::setData(const TransliterationRuleData* d) {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 //eof

icu4c/source/i18n/strmatch.h

@@ -8,6 +8,10 @@
 #ifndef STRMATCH_H
 #define STRMATCH_H
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/unistr.h"
 #include "unicode/unifunct.h"
 #include "unicode/unimatch.h"
@@ -249,4 +253,6 @@ class StringMatcher : public UnicodeFunctor, public UnicodeMatcher, public Unico
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/strrepl.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "strrepl.h"
 #include "rbt_data.h"
 #include "util.h"
@@ -294,4 +298,6 @@ void StringReplacer::setData(const TransliterationRuleData* d) {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 //eof

icu4c/source/i18n/strrepl.h

@@ -11,6 +11,10 @@
 #ifndef STRREPL_H
 #define STRREPL_H
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/unifunct.h"
 #include "unicode/unirepl.h"
 #include "unicode/unistr.h"
@@ -160,6 +164,8 @@ class StringReplacer : public UnicodeFunctor, public UnicodeReplacer {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif
 
 //eof

icu4c/source/i18n/stsearch.cpp

@@ -7,6 +7,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_COLLATION
+
 #include "unicode/stsearch.h"
 #include "usrchimp.h"
 #include "cmemory.h"
@@ -362,11 +366,15 @@ int32_t StringSearch::handleNext(int32_t position, UErrorCode &status)
                 if (U_FAILURE(status)) {
                     return USEARCH_DONE;
                 }
-                if (m_breakiterator_ == NULL || 
+                if (m_breakiterator_ == NULL
+#if !UCONFIG_NO_BREAK_ITERATION
+                    || 
                     m_search_->matchedIndex == USEARCH_DONE ||
                     (m_breakiterator_->isBoundary(m_search_->matchedIndex) &&
                      m_breakiterator_->isBoundary(m_search_->matchedIndex + 
-                                                  m_search_->matchedLength))) {
+                                                  m_search_->matchedLength))
+#endif
+                ) {
                     return m_search_->matchedIndex;
                 }
             }
@@ -413,11 +421,15 @@ int32_t StringSearch::handlePrev(int32_t position, UErrorCode &status)
                 if (U_FAILURE(status)) {
                     return USEARCH_DONE;
                 }
-                if (m_breakiterator_ == NULL || 
+                if (m_breakiterator_ == NULL
+#if !UCONFIG_NO_BREAK_ITERATION
+                    || 
                     m_search_->matchedIndex == USEARCH_DONE ||
                     (m_breakiterator_->isBoundary(m_search_->matchedIndex) &&
                      m_breakiterator_->isBoundary(m_search_->matchedIndex + 
-                                                  m_search_->matchedLength))) {
+                                                  m_search_->matchedLength))
+#endif
+                ) {
                     return m_search_->matchedIndex;
                 }
             }
@@ -430,4 +442,4 @@ int32_t StringSearch::handlePrev(int32_t position, UErrorCode &status)
 
 U_NAMESPACE_END
 
-
+#endif /* #if !UCONFIG_NO_COLLATION */

icu4c/source/i18n/tblcoll.cpp

@@ -54,6 +54,10 @@
 * 01/29/01     synwee      Modified into a C++ wrapper calling C APIs (ucol.h)
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_COLLATION
+
 #include "unicode/tblcoll.h"
 #include "unicode/coleitr.h"
 #include "unicode/resbund.h"
@@ -692,3 +696,5 @@ const char RuleBasedCollator::kFilenameSuffix[] = ".col";
 const char  RuleBasedCollator::fgClassID = 0;
 
 U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_COLLATION */

icu4c/source/i18n/timezone.cpp

@@ -35,6 +35,10 @@
 *                           available IDs code.  Misc. cleanup.
 *********************************************************************************/
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/simpletz.h"
 #include "unicode/smpdtfmt.h"
 #include "unicode/calendar.h"
@@ -814,4 +818,6 @@ TimeZone::hasSameRules(const TimeZone& other) const
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 //eof

icu4c/source/i18n/titletrn.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/uchar.h"
 #include "unicode/uniset.h"
 #include "unicode/ustring.h"
@@ -189,3 +193,4 @@ void TitlecaseTransliterator::cleanup() {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/titletrn.h

@@ -10,6 +10,10 @@
 #ifndef TITLETRN_H
 #define TITLETRN_H
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/translit.h"
 #include "unicode/locid.h"
 
@@ -106,4 +110,6 @@ class U_I18N_API TitlecaseTransliterator : public Transliterator {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/tolowtrn.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/uchar.h"
 #include "unicode/ustring.h"
 #include "tolowtrn.h"
@@ -114,3 +118,4 @@ void LowercaseTransliterator::handleTransliterate(Replaceable& text,
 }
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/tolowtrn.h

@@ -10,6 +10,10 @@
 #ifndef TOLOWTRN_H
 #define TOLOWTRN_H
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/translit.h"
 #include "unicode/locid.h"
 
@@ -95,4 +99,6 @@ class U_I18N_API LowercaseTransliterator : public Transliterator {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/toupptrn.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/ustring.h"
 #include "unicode/uchar.h"
 #include "toupptrn.h"
@@ -118,3 +122,4 @@ void UppercaseTransliterator::handleTransliterate(Replaceable& text,
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/toupptrn.h

@@ -10,6 +10,10 @@
 #ifndef TOUPPTRN_H
 #define TOUPPTRN_H
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/translit.h"
 #include "unicode/locid.h"
 
@@ -96,4 +100,6 @@ class U_I18N_API UppercaseTransliterator : public Transliterator {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/translit.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 /* These APIs are becoming private */
 #define ICU_COMPOUNDTRANSLITERATOR_USE_DEPRECATES 1
 #define ICU_NULLTRANSLITERATOR_USE_DEPRECATES 1
@@ -751,6 +755,7 @@ UnicodeString& Transliterator::getDisplayName(const UnicodeString& id,
         return result = resString; // [sic] assign & return
     }
 
+#if !UCONFIG_NO_FORMATTING
     // We have failed to get a name from the locale data.  This is
     // typical, since most transliterators will not have localized
     // name data.  The next step is to retrieve the MessageFormat
@@ -796,6 +801,7 @@ UnicodeString& Transliterator::getDisplayName(const UnicodeString& id,
             return result;
         }
     }
+#endif
 
     // We should not reach this point unless there is something
     // wrong with the build or the RB_DISPLAY_NAME_PATTERN has
@@ -1441,4 +1447,6 @@ U_CFUNC UBool transliterator_cleanup(void) {
     return TRUE;
 }
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 //eof

icu4c/source/i18n/transreg.cpp

@@ -8,6 +8,10 @@
 **********************************************************************
 */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 /* These APIs are becoming private */
 #define ICU_RULEBASEDTRANSLITERATOR_USE_DEPRECATES 1
 #define ICU_COMPOUNDTRANSLITERATOR_USE_DEPRECATES 1
@@ -1126,4 +1130,6 @@ Transliterator* TransliteratorRegistry::instantiateEntry(const UnicodeString& ID
 }
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 //eof

icu4c/source/i18n/transreg.h

@@ -11,6 +11,9 @@
 #define _TRANSREG_H
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/uobject.h"
 #include "unicode/translit.h"
 #include "hash.h"
@@ -399,5 +402,7 @@ class TransliteratorRegistry : public UObject {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif
 //eof

icu4c/source/i18n/tridpars.cpp

@@ -7,6 +7,11 @@
 *   01/14/2002  aliu        Creation.
 **********************************************************************
 */
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "tridpars.h"
 #include "hash.h"
 #include "mutex.h"
@@ -887,4 +892,6 @@ void TransliteratorIDParser::cleanup() {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 //eof

icu4c/source/i18n/tridpars.h

@@ -11,6 +11,9 @@
 #define TRIDPARS_H
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_TRANSLITERATION
+
 #include "unicode/uobject.h"
 #include "unicode/unistr.h"
 
@@ -394,4 +397,6 @@ class TransliteratorIDParser /* not : public UObject because all methods are sta
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
+
 #endif

icu4c/source/i18n/tzdat.h

@@ -15,6 +15,8 @@
 
 #include "unicode/utypes.h"
 
+#if !UCONFIG_NO_FORMATTING
+
 /* This file defines the format of the memory-mapped data file
  * containing system time zone data for icu.  See also gentz
  * and tz.pl.
@@ -200,4 +202,6 @@ struct CountryIndex {
     uint16_t  zoneNumber; // There are actually 'count' uint16_t's here
 };
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 #endif