From: Norbert Runge <nrunge@google.com>
Date: Fri, 6 Oct 2017 16:52:14 +0000 (+0000)
Subject: ICU-13384 fixes issues found in public header checks and unconfig.h variation check.
X-Git-Tag: release-60-rc~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d835c3aac4818d4cd19caeb908a8de81ef397d43;p=icu

ICU-13384 fixes issues found in public header checks and unconfig.h variation check.

X-SVN-Rev: 40592
---

diff --git a/icu4c/source/common/rbbi_cache.cpp b/icu4c/source/common/rbbi_cache.cpp
index 4bf68fe1ad3..f5daf3375a9 100644
--- a/icu4c/source/common/rbbi_cache.cpp
+++ b/icu4c/source/common/rbbi_cache.cpp
@@ -4,6 +4,9 @@
 // file: rbbi_cache.cpp
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "unicode/ubrk.h"
 #include "unicode/rbbi.h"
 
@@ -622,3 +625,5 @@ void RuleBasedBreakIterator::BreakCache::dumpCache() {
 }
 
 U_NAMESPACE_END
+
+#endif // #if !UCONFIG_NO_BREAK_ITERATION
diff --git a/icu4c/source/common/rbbi_cache.h b/icu4c/source/common/rbbi_cache.h
index 72576e55a2a..11591940afd 100644
--- a/icu4c/source/common/rbbi_cache.h
+++ b/icu4c/source/common/rbbi_cache.h
@@ -8,6 +8,8 @@
 
 #include "unicode/utypes.h"
 
+#if !UCONFIG_NO_BREAK_ITERATION
+
 #include "unicode/rbbi.h"
 #include "unicode/uobject.h"
 
@@ -196,4 +198,6 @@ class RuleBasedBreakIterator::BreakCache: public UMemory {
 
 U_NAMESPACE_END
 
+#endif // #if !UCONFIG_NO_BREAK_ITERATION
+
 #endif // RBBI_CACHE_H
diff --git a/icu4c/source/common/unicode/uconfig.h b/icu4c/source/common/unicode/uconfig.h
index c26fce461fd..326ff7ab0e5 100644
--- a/icu4c/source/common/unicode/uconfig.h
+++ b/icu4c/source/common/unicode/uconfig.h
@@ -262,7 +262,8 @@
 
 /**
  * \def UCONFIG_NO_CONVERSION
- * ICU will not completely build with this switch turned on.
+ * ICU will not completely build (compiling the tools fails) with this
+ * switch turned on.
  * This switch turns off all converters.
  *
  * You may want to use this together with U_CHARSET_IS_UTF8 defined to 1
@@ -320,7 +321,9 @@
  */
 #ifndef UCONFIG_NO_NORMALIZATION
 #   define UCONFIG_NO_NORMALIZATION 0
-#elif UCONFIG_NO_NORMALIZATION
+#endif
+
+#if UCONFIG_NO_NORMALIZATION
     /* common library */
     /* ICU 50 CJK dictionary BreakIterator uses normalization */
 #   define UCONFIG_NO_BREAK_ITERATION 1
diff --git a/icu4c/source/i18n/unicode/dtptngen.h b/icu4c/source/i18n/unicode/dtptngen.h
index 19ded6d8335..5712edbb9ff 100644
--- a/icu4c/source/i18n/unicode/dtptngen.h
+++ b/icu4c/source/i18n/unicode/dtptngen.h
@@ -18,6 +18,7 @@
 #include "unicode/locid.h"
 #include "unicode/udat.h"
 #include "unicode/udatpg.h"
+#include "unicode/unistr.h"
 
 U_NAMESPACE_BEGIN
 
diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp
index 48a1f858067..4eb5d97c314 100644
--- a/icu4c/source/test/intltest/loctest.cpp
+++ b/icu4c/source/test/intltest/loctest.cpp
@@ -10,6 +10,7 @@
 #include "unicode/decimfmt.h"
 #include "unicode/ucurr.h"
 #include "unicode/smpdtfmt.h"
+#include "unicode/strenum.h"
 #include "unicode/dtfmtsym.h"
 #include "unicode/brkiter.h"
 #include "unicode/coll.h"
diff --git a/icu4c/source/test/intltest/rbbitst.cpp b/icu4c/source/test/intltest/rbbitst.cpp
index 7333a79544d..aa6091183ba 100644
--- a/icu4c/source/test/intltest/rbbitst.cpp
+++ b/icu4c/source/test/intltest/rbbitst.cpp
@@ -4720,6 +4720,7 @@ void RBBITest::TestBug12932() {
 // Emoji Test. Verify that the sequences defined in the Unicode data file emoji-test.txt
 //             remain undevided by ICU char, word and line break.
 void RBBITest::TestEmoji() {
+#if !UCONFIG_NO_REGULAR_EXPRESSIONS
     UErrorCode  status = U_ZERO_ERROR;
 
     CharString testFileName;
@@ -4800,6 +4801,7 @@ void RBBITest::TestEmoji() {
             }
         }
     }
+#endif
 }
 
 
@@ -4856,4 +4858,4 @@ void RBBITest::TestProperties() {
     }
 }
 
-#endif /* #if !UCONFIG_NO_BREAK_ITERATION */
+#endif // #if !UCONFIG_NO_BREAK_ITERATION