ICU-4790 Fix uconfig error.

X-SVN-Rev: 25985

icu4c/source/i18n/bms.cpp

@@ -10,6 +10,10 @@
 #include "unicode/colldata.h"
 #include "unicode/bmsearch.h"
 
+
+#if !UCONFIG_NO_COLLATION
+
+
 //#define USE_SAFE_CASTS
 #ifdef USE_SAFE_CASTS
 #define STATIC_CAST(type,value) static_cast<type>(value)
@@ -143,3 +147,5 @@ bms_setTargetString(BMS *bms, const UChar *target, int32_t targetLength, UErrorC
 
     bms->bms->setTargetString(bms->targetString, *status);
 }
+
+#endif

icu4c/source/i18n/unicode/bms.h

@@ -13,6 +13,9 @@
 #define _BMS_H
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_COLLATION
+
 #include "unicode/ucol.h"
 
 /**
@@ -265,4 +268,6 @@ bms_search(BMS *bms, int32_t offset, int32_t *start, int32_t *end);
 U_CAPI void U_EXPORT2
 bms_setTargetString(BMS *bms, const UChar *target, int32_t targetLength, UErrorCode *status);
 
+#endif
+
 #endif /* _BMS_H */

icu4c/source/i18n/unicode/tmunit.h

@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2008, Google, International Business Machines Corporation and *
+ * Copyright (C) 2009, Google, International Business Machines Corporation and *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -15,10 +15,10 @@
  */
 
 
-#if !UCONFIG_NO_FORMATTING
-
 #include "unicode/measunit.h"
 
+#if !UCONFIG_NO_FORMATTING
+
 U_NAMESPACE_BEGIN
 
 /**

icu4c/source/i18n/unicode/tmutamt.h

@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2008, Google, International Business Machines Corporation and *
+ * Copyright (C) 2009, Google, International Business Machines Corporation and *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */ 
@@ -14,11 +14,11 @@
  * \brief C++ API: time unit amount object.
  */
 
-#if !UCONFIG_NO_FORMATTING
-
 #include "unicode/measure.h"
 #include "unicode/tmunit.h"
 
+#if !UCONFIG_NO_FORMATTING
+
 U_NAMESPACE_BEGIN
 
 

icu4c/source/i18n/unicode/uspoof.h

@@ -26,6 +26,10 @@
 #include "unicode/uset.h"
 #include "unicode/parseerr.h"
 
+
+#if !UCONFIG_NO_NORMALIZATION
+
+
 #ifdef XP_CPLUSPLUS
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
@@ -851,4 +855,6 @@ uspoof_serialize(USpoofChecker *sc,
                  UErrorCode *status);
 
 
+#endif
+
 #endif   /* USPOOF_H */

icu4c/source/i18n/uspoof.cpp

@@ -21,6 +21,10 @@
 #include "uspoof_impl.h"
 #include "uassert.h"
 
+
+#if !UCONFIG_NO_NORMALIZATION
+
+
 #include <stdio.h>      // debug
 
 U_NAMESPACE_USE
@@ -819,3 +823,4 @@ uspoof_serialize(USpoofChecker *sc,void *buf, int32_t capacity, UErrorCode *stat
     return dataSize;
 }
 
+#endif

icu4c/source/i18n/uspoof_build.cpp

@@ -37,6 +37,8 @@
 #include "uspoof_buildconf.h"
 #include "uspoof_buildwsconf.h"
 
+#if !UCONFIG_NO_NORMALIZATION
+
 U_NAMESPACE_USE
 
 
@@ -80,3 +82,4 @@ uspoof_openFromSource(const char *confusables,  int32_t confusablesLen,
 #endif // UCONFIG_NO_REGULAR_EXPRESSIONS 
 }
 
+#endif

icu4c/source/i18n/uspoof_buildconf.cpp

@@ -19,6 +19,8 @@
 #include "unicode/utypes.h"
 #include "unicode/uspoof.h"
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS 
+#if !UCONFIG_NO_NORMALIZATION
+
 #include "unicode/unorm.h"
 #include "unicode/uregex.h"
 #include "unicode/ustring.h"
@@ -591,5 +593,6 @@ UnicodeString ConfusabledataBuilder::getMapping(int32_t index) {
     return UnicodeString();
 }
 
+#endif
 #endif // !UCONFIG_NO_REGULAR_EXPRESSIONS 
 

icu4c/source/i18n/uspoof_buildconf.h

@@ -19,6 +19,8 @@
 #ifndef __USPOOF_BUILDCONF_H__
 #define __USPOOF_BUILDCONF_H__
 
+#if !UCONFIG_NO_NORMALIZATION
+
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS 
 
 #include "uspoof_impl.h"
@@ -122,5 +124,6 @@ class ConfusabledataBuilder : public UMemory {
         int32_t confusablesLen, int32_t *errorType, UParseError *pe, UErrorCode &status);
 };
 
+#endif
 #endif  // !UCONFIG_NO_REGULAR_EXPRESSIONS 
 #endif  // __USPOOF_BUILDCONF_H__

icu4c/source/i18n/uspoof_buildwsconf.cpp

@@ -21,6 +21,8 @@
 #include "unicode/utypes.h"
 #include "unicode/uspoof.h"
 
+#if !UCONFIG_NO_NORMALIZATION
+
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS 
 
 #include "unicode/unorm.h"
@@ -428,5 +430,6 @@ BuilderScriptSet::~BuilderScriptSet() {
     }
 }
 
+#endif
 #endif //  !UCONFIG_NO_REGULAR_EXPRESSIONS 
 

icu4c/source/i18n/uspoof_buildwsconf.h

@@ -22,6 +22,8 @@
 
 #include "unicode/utypes.h"
 
+#if !UCONFIG_NO_NORMALIZATION
+
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS 
 
 #include "uspoof_impl.h"
@@ -59,3 +61,5 @@ void buildWSConfusableData(SpoofImpl *spImpl, const char * confusablesWS,
 
 #endif // !UCONFIG_NO_REGULAR_EXPRESSIONS 
 #endif
+#endif // !UCONFIG_NO_REGULAR_EXPRESSIONS 
+#endif

icu4c/source/i18n/uspoof_impl.cpp

@@ -19,6 +19,8 @@
 #include "uassert.h"
 #include "uspoof_impl.h"
 
+#if !UCONFIG_NO_NORMALIZATION
+
 
 U_NAMESPACE_BEGIN
 
@@ -955,4 +957,6 @@ uspoof_swap(const UDataSwapper *ds, const void *inData, int32_t length, void *ou
     return totalSize;
 }
 
+#endif
+
 

icu4c/source/i18n/uspoof_impl.h

@@ -20,6 +20,8 @@
 #include "unicode/udata.h"
 
 
+#if !UCONFIG_NO_NORMALIZATION
+
 U_NAMESPACE_BEGIN
 
 // The maximium length (in UTF-16 UChars) of the skeleton replacement string resulting from
@@ -403,5 +405,7 @@ uspoof_swap(const UDataSwapper *ds, const void *inData, int32_t length, void *ou
             UErrorCode *status);
 
 
+#endif
+
 #endif  /* USPOOFIM_H */
 

icu4c/source/test/hdrtst/cxxfiles.txt

@@ -17,6 +17,7 @@ convert.h
 cpdtrans.h
 curramt.h
 currunit.h
+currpinf.h
 datefmt.h
 dbbi.h
 dcfmtsym.h

icu4c/source/tools/toolutil/swapimpl.cpp

@@ -57,7 +57,10 @@
 
 /* swapping implementations in i18n */
 
+#if !UCONFIG_NO_NORMALIZATION
 #include "uspoof_impl.h"
+#endif
+
 
 /* definitions */