ICU-20578 headers: guard all C++ headers using U_SHOW_CPLUSPLUS_API

support including all files in C

cleanup and simplify the test/hdrtest

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

diff --git a/.gitignore b/.gitignore
index 5b5180d1157fd4d4c626c33abcde764809dc04e3..f64b51fe62681917c766f46e156eb3804daf1840 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -429,9 +429,8 @@ icu4c/source/test/cintltst/release
 icu4c/source/test/cintltst/x64
 icu4c/source/test/cintltst/x86
 icu4c/source/test/compat/Makefile
-icu4c/source/test/hdrtst/*.[co]
 icu4c/source/test/hdrtst/Makefile
-icu4c/source/test/hdrtst/cfiles.txt
+icu4c/source/test/hdrtst/ht_*
 icu4c/source/test/intltest/*.d
 icu4c/source/test/intltest/*.o
 icu4c/source/test/intltest/*.plg

diff --git a/icu4c/source/common/unicode/appendable.h b/icu4c/source/common/unicode/appendable.h
index 8512c2f30311b8d1bc1b8a8e467ddadc3828d42f..4beacaf65836207a3c2f64675846cee9c506f810 100644 (file)
--- a/icu4c/source/common/unicode/appendable.h
+++ b/icu4c/source/common/unicode/appendable.h
@@ -23,6 +23,9 @@
  */
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 
 U_NAMESPACE_BEGIN
@@ -231,4 +234,6 @@ private:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __APPENDABLE_H__

diff --git a/icu4c/source/common/unicode/brkiter.h b/icu4c/source/common/unicode/brkiter.h
index ac1bf1df29f214de0e47912885c546d883fb871c..a0fbf724503504b81583302ce5655ca304c6ff8e 100644 (file)
--- a/icu4c/source/common/unicode/brkiter.h
+++ b/icu4c/source/common/unicode/brkiter.h
@@ -29,6 +29,10 @@
  * \brief C++ API: Break Iterator.
  */
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #if UCONFIG_NO_BREAK_ITERATION
 
 U_NAMESPACE_BEGIN
@@ -658,5 +662,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_BREAK_ITERATION */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // BRKITER_H
 //eof

diff --git a/icu4c/source/common/unicode/bytestream.h b/icu4c/source/common/unicode/bytestream.h
index 493115f71c7d355fecf46b1af27730a0e32c3394..0d60492fe235563db2198bd55f0f6f02ad60b456 100644 (file)
--- a/icu4c/source/common/unicode/bytestream.h
+++ b/icu4c/source/common/unicode/bytestream.h
@@ -38,6 +38,9 @@
  */
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 #include "unicode/std_string.h"
 
@@ -267,4 +270,6 @@ class StringByteSink : public ByteSink {
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __BYTESTREAM_H__

diff --git a/icu4c/source/common/unicode/bytestrie.h b/icu4c/source/common/unicode/bytestrie.h
index c57b8ccfeb59600d9e8fe8ae690bddff9cafb7a8..9dc0ed2615785b9f397e8de5cbaf54f2b24874b4 100644 (file)
--- a/icu4c/source/common/unicode/bytestrie.h
+++ b/icu4c/source/common/unicode/bytestrie.h
@@ -23,6 +23,9 @@
  */
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/stringpiece.h"
 #include "unicode/uobject.h"
 #include "unicode/ustringtrie.h"
@@ -517,4 +520,6 @@ private:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __BYTESTRIE_H__

diff --git a/icu4c/source/common/unicode/bytestriebuilder.h b/icu4c/source/common/unicode/bytestriebuilder.h
index 2a1f28e6255d77fffc5083470d417b0bf3a90454..b98374bb8fdbc142acb092ac233b74a3696f08b6 100644 (file)
--- a/icu4c/source/common/unicode/bytestriebuilder.h
+++ b/icu4c/source/common/unicode/bytestriebuilder.h
@@ -23,6 +23,9 @@
 #define __BYTESTRIEBUILDER_H__
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/bytestrie.h"
 #include "unicode/stringpiece.h"
 #include "unicode/stringtriebuilder.h"
@@ -179,4 +182,6 @@ private:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __BYTESTRIEBUILDER_H__

diff --git a/icu4c/source/common/unicode/caniter.h b/icu4c/source/common/unicode/caniter.h
index 9b21ba52d89855feaf029263a9f3a7c6a4a7e8e4..13e524ff6ad316777d51990c7d6016d0caf54c17 100644 (file)
--- a/icu4c/source/common/unicode/caniter.h
+++ b/icu4c/source/common/unicode/caniter.h
@@ -12,6 +12,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_NORMALIZATION
 
 #include "unicode/uobject.h"
@@ -207,4 +209,6 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_NORMALIZATION */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/casemap.h b/icu4c/source/common/unicode/casemap.h
index 477eb484d136b6972a731e11cebf3c91bc06761d..53af84fa74d65f2d095edb3e8c314b667f219e52 100644 (file)
--- a/icu4c/source/common/unicode/casemap.h
+++ b/icu4c/source/common/unicode/casemap.h
@@ -8,6 +8,9 @@
 #define __CASEMAP_H__
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/stringpiece.h"
 #include "unicode/uobject.h"
 
@@ -489,4 +492,6 @@ private:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __CASEMAP_H__

diff --git a/icu4c/source/common/unicode/char16ptr.h b/icu4c/source/common/unicode/char16ptr.h
index a7c5f1a0c5ed56631808bcb37fb4e79b6a9806b2..c8a9ae6c35d646f7173d4fff6d5068914ce9408c 100644 (file)
--- a/icu4c/source/common/unicode/char16ptr.h
+++ b/icu4c/source/common/unicode/char16ptr.h
@@ -7,9 +7,12 @@
 #ifndef __CHAR16PTR_H__
 #define __CHAR16PTR_H__
 
-#include <cstddef>
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
+#include <cstddef>
+
 /**
  * \file
  * \brief C++ API: char16_t pointer wrappers with
@@ -305,4 +308,6 @@ inline OldUChar *toOldUCharPtr(char16_t *p) {
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __CHAR16PTR_H__

diff --git a/icu4c/source/common/unicode/chariter.h b/icu4c/source/common/unicode/chariter.h
index 70d7a24883334dc801c88936649c07b7b1fb879f..0e9b7cdd6018c37df69e8fabc71283ce5cd8ebb3 100644 (file)
--- a/icu4c/source/common/unicode/chariter.h
+++ b/icu4c/source/common/unicode/chariter.h
@@ -13,6 +13,9 @@
 #define CHARITER_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 #include "unicode/unistr.h"
 /**
@@ -725,4 +728,7 @@ CharacterIterator::getLength(void) const {
 }
 
 U_NAMESPACE_END
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/dbbi.h b/icu4c/source/common/unicode/dbbi.h
index a2c3d7d75232e48d63b8e82031779d82208e53e8..3de9cc381408c51c77f1414ea62f9f180adeda7a 100644 (file)
--- a/icu4c/source/common/unicode/dbbi.h
+++ b/icu4c/source/common/unicode/dbbi.h
@@ -13,6 +13,10 @@
 #ifndef DBBI_H
 #define DBBI_H
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/rbbi.h"
 
 #if !UCONFIG_NO_BREAK_ITERATION
@@ -39,4 +43,6 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_BREAK_ITERATION */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/dtintrv.h b/icu4c/source/common/unicode/dtintrv.h
index aa6ca71f23dc489e11a6222ee3e9f34215f88ecf..15e15c9d405b6902a3809a5a1bb6abf5f4676314 100644 (file)
--- a/icu4c/source/common/unicode/dtintrv.h
+++ b/icu4c/source/common/unicode/dtintrv.h
@@ -15,6 +15,9 @@
 #define __DTINTRV_H__
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 
 /**
@@ -22,7 +25,6 @@
  * \brief C++ API: Date Interval data type
  */
 
-
 U_NAMESPACE_BEGIN
 
 
@@ -157,4 +159,6 @@ DateInterval::operator!=(const DateInterval& other) const {
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/edits.h b/icu4c/source/common/unicode/edits.h
index 79e98b0cc27ac6716913f10b9177b69dad03283b..01155ab02e14386554bf415e4ee385df3e33cced 100644 (file)
--- a/icu4c/source/common/unicode/edits.h
+++ b/icu4c/source/common/unicode/edits.h
@@ -8,6 +8,9 @@
 #define __EDITS_H__
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 
 /**
@@ -523,4 +526,6 @@ private:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __EDITS_H__

diff --git a/icu4c/source/common/unicode/errorcode.h b/icu4c/source/common/unicode/errorcode.h
index 81cad2074523c21bdbc18e72d5e7d549a3bf9aa7..fe7b5183232cd149913c929a20e8ef7f879b619c 100644 (file)
--- a/icu4c/source/common/unicode/errorcode.h
+++ b/icu4c/source/common/unicode/errorcode.h
@@ -26,6 +26,9 @@
  */
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 
 U_NAMESPACE_BEGIN
@@ -136,4 +139,6 @@ protected:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __ERRORCODE_H__

diff --git a/icu4c/source/common/unicode/filteredbrk.h b/icu4c/source/common/unicode/filteredbrk.h
index 2444114e9a14bfd47f3b12f5ea2e91a75e63703e..a084556206e585fbfed6cf7a7e30b14df43f2089 100644 (file)
--- a/icu4c/source/common/unicode/filteredbrk.h
+++ b/icu4c/source/common/unicode/filteredbrk.h
@@ -11,6 +11,9 @@
 #define FILTEREDBRK_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/brkiter.h"
 
 #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILTERED_BREAK_ITERATION
@@ -142,4 +145,6 @@ U_NAMESPACE_END
 
 #endif // #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILTERED_BREAK_ITERATION
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // #ifndef FILTEREDBRK_H

diff --git a/icu4c/source/common/unicode/idna.h b/icu4c/source/common/unicode/idna.h
index f08658e502e200838dcae236a330bc5b092ff7c4..6dfcfe48db28f1ea9ad21b64ca766091025e66cc 100644 (file)
--- a/icu4c/source/common/unicode/idna.h
+++ b/icu4c/source/common/unicode/idna.h
@@ -24,6 +24,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_IDNA
 
 #include "unicode/bytestream.h"
@@ -322,4 +324,7 @@ private:
 U_NAMESPACE_END
 
 #endif  // UCONFIG_NO_IDNA
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __IDNA_H__

diff --git a/icu4c/source/common/unicode/localebuilder.h b/icu4c/source/common/unicode/localebuilder.h
index 960e5980c03c2e1e0bc505379c3390d09866bc71..cc5eec9cafb23bbffaa5dc8b0e7c2871aef0c603 100644 (file)
--- a/icu4c/source/common/unicode/localebuilder.h
+++ b/icu4c/source/common/unicode/localebuilder.h
@@ -3,10 +3,13 @@
 #ifndef __LOCALEBUILDER_H__
 #define __LOCALEBUILDER_H__
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/locid.h"
 #include "unicode/stringpiece.h"
 #include "unicode/uobject.h"
-#include "unicode/utypes.h"
 
 
 #ifndef U_HIDE_DRAFT_API
@@ -289,4 +292,7 @@ private:
 U_NAMESPACE_END
 
 #endif  // U_HIDE_DRAFT_API
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __LOCALEBUILDER_H__

diff --git a/icu4c/source/common/unicode/locdspnm.h b/icu4c/source/common/unicode/locdspnm.h
index f6e778356feced81f82a760ca054e3f6a91ffa86..4f06f857044c6e9bf5119122394bd2458f760919 100644 (file)
--- a/icu4c/source/common/unicode/locdspnm.h
+++ b/icu4c/source/common/unicode/locdspnm.h
@@ -12,6 +12,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Provides display names of Locale and its components.
@@ -204,4 +206,6 @@ U_NAMESPACE_END
 
 #endif
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/locid.h b/icu4c/source/common/unicode/locid.h
index b474a744344a738d887fe74dc055da07a119355d..8048c1ef74ac38844eebe07a7fc89dde43b15926 100644 (file)
--- a/icu4c/source/common/unicode/locid.h
+++ b/icu4c/source/common/unicode/locid.h
@@ -31,11 +31,14 @@
 #ifndef LOCID_H
 #define LOCID_H
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/bytestream.h"
 #include "unicode/localpointer.h"
 #include "unicode/strenum.h"
 #include "unicode/stringpiece.h"
-#include "unicode/utypes.h"
 #include "unicode/uobject.h"
 #include "unicode/putil.h"
 #include "unicode/uloc.h"
@@ -1178,4 +1181,6 @@ Locale::isBogus(void) const {
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/messagepattern.h b/icu4c/source/common/unicode/messagepattern.h
index 9f2a86551ca417dd8ab00a12189da062757b44ee..04f00a8757d7832179098246317ac907738d122a 100644 (file)
--- a/icu4c/source/common/unicode/messagepattern.h
+++ b/icu4c/source/common/unicode/messagepattern.h
@@ -24,6 +24,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/parseerr.h"
@@ -942,4 +944,6 @@ U_NAMESPACE_END
 
 #endif  // !UCONFIG_NO_FORMATTING
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __MESSAGEPATTERN_H__

diff --git a/icu4c/source/common/unicode/normalizer2.h b/icu4c/source/common/unicode/normalizer2.h
index 4caa0e31034b2db65f75b0b72ab8ec2d904f090f..4aeb3bb3d8292107c8cb6098e29ad8119c6d86da 100644 (file)
--- a/icu4c/source/common/unicode/normalizer2.h
+++ b/icu4c/source/common/unicode/normalizer2.h
@@ -26,6 +26,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_NORMALIZATION
 
 #include "unicode/stringpiece.h"
@@ -771,4 +773,7 @@ private:
 U_NAMESPACE_END
 
 #endif  // !UCONFIG_NO_NORMALIZATION
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __NORMALIZER2_H__

diff --git a/icu4c/source/common/unicode/normlzr.h b/icu4c/source/common/unicode/normlzr.h
index 0141058fb0014a1928ac2b094548e9c456f1eb62..41f10a1963e8d80de8b516104371eb36831be25e 100644 (file)
--- a/icu4c/source/common/unicode/normlzr.h
+++ b/icu4c/source/common/unicode/normlzr.h
@@ -13,6 +13,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: Unicode Normalization
@@ -807,3 +809,5 @@ U_NAMESPACE_END
 #endif /* #if !UCONFIG_NO_NORMALIZATION */
 
 #endif // NORMLZR_H
+
+#endif /* U_SHOW_CPLUSPLUS_API */

diff --git a/icu4c/source/common/unicode/parsepos.h b/icu4c/source/common/unicode/parsepos.h
index b63b84f294446fdb4dd66f1d95c30a6567178bd9..909d288d48d0fe3d6b5b48de5eb7284805dadadb 100644 (file)
--- a/icu4c/source/common/unicode/parsepos.h
+++ b/icu4c/source/common/unicode/parsepos.h
@@ -19,6 +19,9 @@
 #define PARSEPOS_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 
  
@@ -229,4 +232,6 @@ ParsePosition::setErrorIndex(int32_t ei)
 }
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/rbbi.h b/icu4c/source/common/unicode/rbbi.h
index 365ae2d3d2ac75a4e23350889dc74a695c1d8e67..5e6b3ab209d764c6862435d525b8f2e6aa5fd320 100644 (file)
--- a/icu4c/source/common/unicode/rbbi.h
+++ b/icu4c/source/common/unicode/rbbi.h
@@ -18,6 +18,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Rule Based Break Iterator
@@ -696,4 +698,6 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_BREAK_ITERATION */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/rep.h b/icu4c/source/common/unicode/rep.h
index 41fdc040497bf2cdd40c003e91076f59645073a0..68b2e7c89651ec2f4128d918b387a2d6a6b3a630 100644 (file)
--- a/icu4c/source/common/unicode/rep.h
+++ b/icu4c/source/common/unicode/rep.h
@@ -16,6 +16,10 @@
 #ifndef REP_H
 #define REP_H
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 
 /**
@@ -260,4 +264,6 @@ Replaceable::char32At(int32_t offset) const {
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/resbund.h b/icu4c/source/common/unicode/resbund.h
index ad5899003b3013a3e6aeccbfce49f104ef036345..2894067528724f29911230f501607ffae387298e 100644 (file)
--- a/icu4c/source/common/unicode/resbund.h
+++ b/icu4c/source/common/unicode/resbund.h
@@ -49,6 +49,9 @@
 #define RESBUND_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 #include "unicode/ures.h"
 #include "unicode/unistr.h"
@@ -489,4 +492,7 @@ private:
 };
 
 U_NAMESPACE_END
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/schriter.h b/icu4c/source/common/unicode/schriter.h
index 42f02691e12082967ee9fd2dd5b5897d7a9567ab..b38f95d22acbfc1c620e9d982cd8788176c852dd 100644 (file)
--- a/icu4c/source/common/unicode/schriter.h
+++ b/icu4c/source/common/unicode/schriter.h
@@ -21,6 +21,9 @@
 #define SCHRITER_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/chariter.h"
 #include "unicode/uchriter.h"
 
@@ -186,4 +189,7 @@ protected:
 };
 
 U_NAMESPACE_END
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/simpleformatter.h b/icu4c/source/common/unicode/simpleformatter.h
index 3f7d93dc094a18ebeb6f371383adc8550dcc6eec..9414bca3085ad448a16211b7627960c1ce1dee53 100644 (file)
--- a/icu4c/source/common/unicode/simpleformatter.h
+++ b/icu4c/source/common/unicode/simpleformatter.h
@@ -17,6 +17,9 @@
  */
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/unistr.h"
 
 U_NAMESPACE_BEGIN
@@ -333,4 +336,6 @@ private:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __SIMPLEFORMATTER_H__

diff --git a/icu4c/source/common/unicode/std_string.h b/icu4c/source/common/unicode/std_string.h
index 729c56399506eb38b2c9edc1c6420e5abbe5d897..bf87230167ecf25ce98aef43a05302c165497c67 100644 (file)
--- a/icu4c/source/common/unicode/std_string.h
+++ b/icu4c/source/common/unicode/std_string.h
@@ -27,6 +27,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 // Workaround for a libstdc++ bug before libstdc++4.6 (2011).
 // https://bugs.llvm.org/show_bug.cgi?id=13364
 #if defined(__GLIBCXX__)
@@ -34,4 +36,6 @@ namespace std { class type_info; }
 #endif
 #include <string>
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __STD_STRING_H__

diff --git a/icu4c/source/common/unicode/strenum.h b/icu4c/source/common/unicode/strenum.h
index 61d514813b92c14679a99ce4f7c2c9f89b6f15f7..a303c5a983a2b363bacc32da484b92a4e919aef9 100644 (file)
--- a/icu4c/source/common/unicode/strenum.h
+++ b/icu4c/source/common/unicode/strenum.h
@@ -12,6 +12,10 @@
 #ifndef STRENUM_H
 #define STRENUM_H
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 #include "unicode/unistr.h"
 
@@ -274,5 +278,7 @@ protected:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 /* STRENUM_H */
 #endif

diff --git a/icu4c/source/common/unicode/stringpiece.h b/icu4c/source/common/unicode/stringpiece.h
index b0887effa52585601897b2a8420177ad58843e9e..aded0e416980d6c95f14c06b8846c0faae796808 100644 (file)
--- a/icu4c/source/common/unicode/stringpiece.h
+++ b/icu4c/source/common/unicode/stringpiece.h
@@ -28,6 +28,9 @@
  */
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 #include "unicode/std_string.h"
 
@@ -221,4 +224,6 @@ inline UBool operator!=(const StringPiece& x, const StringPiece& y) {
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __STRINGPIECE_H__

diff --git a/icu4c/source/common/unicode/stringtriebuilder.h b/icu4c/source/common/unicode/stringtriebuilder.h
index fe99fdb41fdd4f5a3cb7ffff1eb3b2d06716fe93..2c47dd415b18842af3cf7f36424929ea0ac4138c 100644 (file)
--- a/icu4c/source/common/unicode/stringtriebuilder.h
+++ b/icu4c/source/common/unicode/stringtriebuilder.h
@@ -18,6 +18,9 @@
 #define __STRINGTRIEBUILDER_H__
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 
 /**
@@ -418,4 +421,6 @@ protected:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __STRINGTRIEBUILDER_H__

diff --git a/icu4c/source/common/unicode/symtable.h b/icu4c/source/common/unicode/symtable.h
index 35e5f238a709545beacb8c65fd13bafed0a4fb4f..b64d877f97430fa6490b8ee1b06b766c77adfc52 100644 (file)
--- a/icu4c/source/common/unicode/symtable.h
+++ b/icu4c/source/common/unicode/symtable.h
@@ -13,6 +13,9 @@
 #define SYMTABLE_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 
 /**
@@ -111,4 +114,6 @@ public:
 };
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/ucharstrie.h b/icu4c/source/common/unicode/ucharstrie.h
index dfc93f6d0bae8acf02463b99044e8dea72e939bb..a702758beb31f93ce82e61da83bad2b98a88e72a 100644 (file)
--- a/icu4c/source/common/unicode/ucharstrie.h
+++ b/icu4c/source/common/unicode/ucharstrie.h
@@ -24,6 +24,9 @@
  */
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/unistr.h"
 #include "unicode/uobject.h"
 #include "unicode/ustringtrie.h"
@@ -575,4 +578,6 @@ private:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __UCHARSTRIE_H__

diff --git a/icu4c/source/common/unicode/ucharstriebuilder.h b/icu4c/source/common/unicode/ucharstriebuilder.h
index 2aa4757e52cb07c7e1c27902d883a357b66d3166..540dcc047fd563eca8cd6631529c1386f7079a2e 100644 (file)
--- a/icu4c/source/common/unicode/ucharstriebuilder.h
+++ b/icu4c/source/common/unicode/ucharstriebuilder.h
@@ -18,6 +18,9 @@
 #define __UCHARSTRIEBUILDER_H__
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/stringtriebuilder.h"
 #include "unicode/ucharstrie.h"
 #include "unicode/unistr.h"
@@ -184,4 +187,6 @@ private:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // __UCHARSTRIEBUILDER_H__

diff --git a/icu4c/source/common/unicode/uchriter.h b/icu4c/source/common/unicode/uchriter.h
index efcd263f8bcc90ea6a78b9e6c1f7651be621a64b..bf7c1ce7f0b154691439c4fa39d2c72643ec3403 100644 (file)
--- a/icu4c/source/common/unicode/uchriter.h
+++ b/icu4c/source/common/unicode/uchriter.h
@@ -11,6 +11,9 @@
 #define UCHRITER_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/chariter.h"
 
 /**
@@ -384,4 +387,7 @@ protected:
 };
 
 U_NAMESPACE_END
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/unifilt.h b/icu4c/source/common/unicode/unifilt.h
index e10527154b6de13e65de39f4195547a219fc93a7..cb7b078c185f08d1054d53f866cebab9d16aed30 100644 (file)
--- a/icu4c/source/common/unicode/unifilt.h
+++ b/icu4c/source/common/unicode/unifilt.h
@@ -12,6 +12,10 @@
 #ifndef UNIFILT_H
 #define UNIFILT_H
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/unifunct.h"
 #include "unicode/unimatch.h"
 
@@ -119,4 +123,6 @@ protected:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/unifunct.h b/icu4c/source/common/unicode/unifunct.h
index 1c50759686148e98c660fabf56ac353b675b87cc..7d31af7dafb7727170ea67cedfd1db3bb40fada1 100644 (file)
--- a/icu4c/source/common/unicode/unifunct.h
+++ b/icu4c/source/common/unicode/unifunct.h
@@ -13,6 +13,9 @@
 #define UNIFUNCT_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 
 /**
@@ -124,4 +127,6 @@ protected:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/unimatch.h b/icu4c/source/common/unicode/unimatch.h
index ee4326f93c1eb88bd7ce9112306d559c1365528e..5a192b1b427da4e866a551fd59bb6a1a99fd7f21 100644 (file)
--- a/icu4c/source/common/unicode/unimatch.h
+++ b/icu4c/source/common/unicode/unimatch.h
@@ -17,6 +17,7 @@
  * \brief C++ API: Unicode Matcher
  */
 
+#if U_SHOW_CPLUSPLUS_API
 
 U_NAMESPACE_BEGIN
 
@@ -162,4 +163,6 @@ public:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/uniset.h b/icu4c/source/common/unicode/uniset.h
index 4a94d624c7a2647671643ef72f6c0b59c9e6734a..77fab603904061223b65c33ff76620276983e8ce 100644 (file)
--- a/icu4c/source/common/unicode/uniset.h
+++ b/icu4c/source/common/unicode/uniset.h
@@ -13,6 +13,10 @@
 #ifndef UNICODESET_H
 #define UNICODESET_H
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/ucpmap.h"
 #include "unicode/unifilt.h"
 #include "unicode/unistr.h"
@@ -1736,4 +1740,6 @@ inline int32_t UnicodeSet::spanBack(const UnicodeString &s, int32_t limit, USetS
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/unistr.h b/icu4c/source/common/unicode/unistr.h
index d79168b9195f303d7b62731b48fa551d1776077f..012b25f0b9fdd82c384331069cc4bfd276b82b61 100644 (file)
--- a/icu4c/source/common/unicode/unistr.h
+++ b/icu4c/source/common/unicode/unistr.h
@@ -28,8 +28,11 @@
  * \brief C++ API: Unicode String
  */
 
-#include <cstddef>
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
+#include <cstddef>
 #include "unicode/char16ptr.h"
 #include "unicode/rep.h"
 #include "unicode/std_string.h"
@@ -4748,4 +4751,6 @@ UnicodeString::reverse(int32_t start,
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/uobject.h b/icu4c/source/common/unicode/uobject.h
index c2663ebff48bb82a02643e5793b3511ccf779add..27b50aaa129b3ac82b4a2121601d9014320902e1 100644 (file)
--- a/icu4c/source/common/unicode/uobject.h
+++ b/icu4c/source/common/unicode/uobject.h
@@ -20,6 +20,9 @@
 #define __UOBJECT_H__
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/platform.h"
 
 /**
@@ -319,4 +322,6 @@ protected:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/common/unicode/usetiter.h b/icu4c/source/common/unicode/usetiter.h
index d0d99185b7cdb7255e46cb5979d6b0dfe3ca3ca2..c6396fd76c7ff3b6d7c91d329d6e334f6810c62a 100644 (file)
--- a/icu4c/source/common/unicode/usetiter.h
+++ b/icu4c/source/common/unicode/usetiter.h
@@ -10,6 +10,9 @@
 #define USETITER_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 #include "unicode/unistr.h"
 
@@ -317,4 +320,6 @@ inline UChar32 UnicodeSetIterator::getCodepointEnd() const {
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/i18n/unicode/alphaindex.h b/icu4c/source/i18n/unicode/alphaindex.h
index 91524a1ae52c995c5a2037b9d73db68965888389..e3c68ea7cce9e219e02b2fb1d779456252ae0068 100644 (file)
--- a/icu4c/source/i18n/unicode/alphaindex.h
+++ b/icu4c/source/i18n/unicode/alphaindex.h
@@ -13,6 +13,9 @@
 #define INDEXCHARS_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 #include "unicode/locid.h"
 #include "unicode/unistr.h"
@@ -757,4 +760,7 @@ private:
 U_NAMESPACE_END
 
 #endif  // !UCONFIG_NO_COLLATION
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/i18n/unicode/basictz.h b/icu4c/source/i18n/unicode/basictz.h
index 3541207268ddfb0d8a6aadbb4b6c550f087ef0fd..08b66ebc88fcaf774f275fd7282778df75f8448b 100644 (file)
--- a/icu4c/source/i18n/unicode/basictz.h
+++ b/icu4c/source/i18n/unicode/basictz.h
@@ -16,6 +16,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/timezone.h"
@@ -211,6 +213,8 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // BASICTZ_H
 
 //eof

diff --git a/icu4c/source/i18n/unicode/calendar.h b/icu4c/source/i18n/unicode/calendar.h
index 023cf053f254fb2e5b62e40b40a32387b270ca9f..fd86be35d089fbde40228ac9ed9f34ae76772896 100644 (file)
--- a/icu4c/source/i18n/unicode/calendar.h
+++ b/icu4c/source/i18n/unicode/calendar.h
@@ -29,6 +29,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Calendar object
@@ -2529,4 +2531,6 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _CALENDAR

diff --git a/icu4c/source/i18n/unicode/choicfmt.h b/icu4c/source/i18n/unicode/choicfmt.h
index c9f0f1114f89edc41415d68caeef834027d4a245..67a9d93f6caa30573a56fbbbcb76a8a1f5b8f5b9 100644 (file)
--- a/icu4c/source/i18n/unicode/choicfmt.h
+++ b/icu4c/source/i18n/unicode/choicfmt.h
@@ -26,6 +26,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Choice Format.
@@ -592,5 +594,7 @@ U_NAMESPACE_END
 #endif  // U_HIDE_DEPRECATED_API
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // CHOICFMT_H
 //eof

diff --git a/icu4c/source/i18n/unicode/coleitr.h b/icu4c/source/i18n/unicode/coleitr.h
index f2bd2ecc621ac85dbd6813cc614306c1f6d55371..e3ec0e01a18ec3aed5fa6cb4edc4879638c1d082 100644 (file)
--- a/icu4c/source/i18n/unicode/coleitr.h
+++ b/icu4c/source/i18n/unicode/coleitr.h
@@ -35,6 +35,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_COLLATION
 
 #include "unicode/unistr.h"
@@ -404,4 +406,6 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_COLLATION */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/i18n/unicode/coll.h b/icu4c/source/i18n/unicode/coll.h
index 653434f54ca664ed5c9ac5f9f8a0f0f6aca7a926..f105bda0fa53671d42e87317e1da4b224119ad0e 100644 (file)
--- a/icu4c/source/i18n/unicode/coll.h
+++ b/icu4c/source/i18n/unicode/coll.h
@@ -54,6 +54,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_COLLATION
 
 #include "unicode/uobject.h"
@@ -1271,4 +1273,6 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_COLLATION */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/i18n/unicode/compactdecimalformat.h b/icu4c/source/i18n/unicode/compactdecimalformat.h
index 9c1e9183f4657be2fd065db19b1045dd43e3220b..aad80702138aa0555f8b9776f7ab1eee1744181c 100644 (file)
--- a/icu4c/source/i18n/unicode/compactdecimalformat.h
+++ b/icu4c/source/i18n/unicode/compactdecimalformat.h
@@ -14,6 +14,9 @@
 #define __COMPACT_DECIMAL_FORMAT_H__
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Compatibility APIs for compact decimal number formatting.
@@ -187,5 +190,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __COMPACT_DECIMAL_FORMAT_H__
 //eof

diff --git a/icu4c/source/i18n/unicode/curramt.h b/icu4c/source/i18n/unicode/curramt.h
index e321df861d251fd52176229faa449ae8bfb52e5c..18fd3b9995c944011751140b890816aa69307f79 100644 (file)
--- a/icu4c/source/i18n/unicode/curramt.h
+++ b/icu4c/source/i18n/unicode/curramt.h
@@ -15,6 +15,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/measure.h"
@@ -129,4 +131,7 @@ inline const char16_t* CurrencyAmount::getISOCurrency() const {
 U_NAMESPACE_END
 
 #endif // !UCONFIG_NO_FORMATTING
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __CURRENCYAMOUNT_H__

diff --git a/icu4c/source/i18n/unicode/currpinf.h b/icu4c/source/i18n/unicode/currpinf.h
index 7741c608b0777e531b5e89dec87c3fe3a00b22ea..fb0b2a7dbc0b8b335f67d07576e0791179eef816 100644 (file)
--- a/icu4c/source/i18n/unicode/currpinf.h
+++ b/icu4c/source/i18n/unicode/currpinf.h
@@ -11,6 +11,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Currency Plural Information used by Decimal Format
@@ -266,5 +268,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _CURRPINFO
 //eof

diff --git a/icu4c/source/i18n/unicode/currunit.h b/icu4c/source/i18n/unicode/currunit.h
index 408d8d359f3b60b6096f50613bc87b5855223abe..f92326420933da2b7c6945f8df1af4992287b679 100644 (file)
--- a/icu4c/source/i18n/unicode/currunit.h
+++ b/icu4c/source/i18n/unicode/currunit.h
@@ -15,6 +15,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/measunit.h"
@@ -140,4 +142,7 @@ inline const char16_t* CurrencyUnit::getISOCurrency() const {
 U_NAMESPACE_END
 
 #endif // !UCONFIG_NO_FORMATTING
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __CURRENCYUNIT_H__

diff --git a/icu4c/source/i18n/unicode/datefmt.h b/icu4c/source/i18n/unicode/datefmt.h
index 81eb8f9b5255857f1f5d38f6de18baebec95a8e4..59a0e0e28e3906c851086061e66c6b8259a92579 100644 (file)
--- a/icu4c/source/i18n/unicode/datefmt.h
+++ b/icu4c/source/i18n/unicode/datefmt.h
@@ -23,6 +23,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/udat.h"
@@ -953,5 +955,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _DATEFMT
 //eof

diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h
index 55e3d8a6b3b5ec8436d5f4f3488b493dfe481af5..28ebbe58bf0167c10fe9375a8cd9eeee684af73b 100644 (file)
--- a/icu4c/source/i18n/unicode/dcfmtsym.h
+++ b/icu4c/source/i18n/unicode/dcfmtsym.h
@@ -28,10 +28,12 @@
 #define DCFMTSYM_H
 
 #include "unicode/utypes.h"
-#include "unicode/uchar.h"
+
+#if U_SHOW_CPLUSPLUS_API
 
 #if !UCONFIG_NO_FORMATTING
 
+#include "unicode/uchar.h"
 #include "unicode/uobject.h"
 #include "unicode/locid.h"
 #include "unicode/numsys.h"
@@ -582,5 +584,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _DCFMTSYM
 //eof

diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h
index 6b6a9399961998d5d614b4e91c5dd321024f57cc..a637eff1c55f3987163efceb764d9b6ff1fbd217 100644 (file)
--- a/icu4c/source/i18n/unicode/decimfmt.h
+++ b/icu4c/source/i18n/unicode/decimfmt.h
@@ -28,6 +28,9 @@
 #define DECIMFMT_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Compatibility APIs for decimal formatting.
@@ -2216,5 +2219,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _DECIMFMT
 //eof

diff --git a/icu4c/source/i18n/unicode/dtfmtsym.h b/icu4c/source/i18n/unicode/dtfmtsym.h
index fe914b461e6249f602e7ee511388836a804a2cdf..c6d76fe98eb97e91f2e6d8ed40caa6edee33e662 100644 (file)
--- a/icu4c/source/i18n/unicode/dtfmtsym.h
+++ b/icu4c/source/i18n/unicode/dtfmtsym.h
@@ -22,6 +22,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/calendar.h"
@@ -1011,5 +1013,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _DTFMTSYM
 //eof

diff --git a/icu4c/source/i18n/unicode/dtitvfmt.h b/icu4c/source/i18n/unicode/dtitvfmt.h
index 42d77d041f8b28574a3e2f7b07e94af9cebd205d..3afb9c47fc12401f9c2cde885a18cd0c685ac4d8 100644 (file)
--- a/icu4c/source/i18n/unicode/dtitvfmt.h
+++ b/icu4c/source/i18n/unicode/dtitvfmt.h
@@ -16,6 +16,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Format and parse date interval in a language-independent manner.
@@ -1151,5 +1153,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _DTITVFMT_H__
 //eof

diff --git a/icu4c/source/i18n/unicode/dtitvinf.h b/icu4c/source/i18n/unicode/dtitvinf.h
index a5b7f8f797f8ded9700cdec9edfc8e2b7266134a..cfa0d8e876fed506a7979f9748a31e39e1f9dec0 100644 (file)
--- a/icu4c/source/i18n/unicode/dtitvinf.h
+++ b/icu4c/source/i18n/unicode/dtitvinf.h
@@ -16,6 +16,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Date/Time interval patterns for formatting date/time interval
@@ -515,5 +517,7 @@ U_NAMESPACE_END
 
 #endif
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif
 

diff --git a/icu4c/source/i18n/unicode/dtptngen.h b/icu4c/source/i18n/unicode/dtptngen.h
index e50c01b4e360c908ec8a5d2f91f0d6b0f41783bf..65a433204048e9f89d304a88354bfbd6eaeaa8ec 100644 (file)
--- a/icu4c/source/i18n/unicode/dtptngen.h
+++ b/icu4c/source/i18n/unicode/dtptngen.h
@@ -14,6 +14,10 @@
 #ifndef __DTPTNGEN_H__
 #define __DTPTNGEN_H__
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/datefmt.h"
 #include "unicode/locid.h"
 #include "unicode/udat.h"
@@ -587,4 +591,6 @@ private:
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/i18n/unicode/dtrule.h b/icu4c/source/i18n/unicode/dtrule.h
index 07672491a67342cb370eebd163d4f83747179382..66afdb8633dad333583221e5d0249a9dda7cf9c4 100644 (file)
--- a/icu4c/source/i18n/unicode/dtrule.h
+++ b/icu4c/source/i18n/unicode/dtrule.h
@@ -11,6 +11,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: Rule for specifying date and time in an year
@@ -248,5 +250,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // DTRULE_H
 //eof

diff --git a/icu4c/source/i18n/unicode/fieldpos.h b/icu4c/source/i18n/unicode/fieldpos.h
index 0bcc8daa0f73e117347ce4db8615abec3a8f8bd6..23ee38624b746dfa6cbe1be88fd6533f94f8328a 100644 (file)
--- a/icu4c/source/i18n/unicode/fieldpos.h
+++ b/icu4c/source/i18n/unicode/fieldpos.h
@@ -26,6 +26,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: FieldPosition identifies the fields in a formatted output.
@@ -290,5 +292,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _FIELDPOS
 //eof

diff --git a/icu4c/source/i18n/unicode/fmtable.h b/icu4c/source/i18n/unicode/fmtable.h
index a06c23dc3bd53258a09d98cc23807e3d65b71aec..7bec4f6906e7ee4e1de0e8eb26192115a0796c6f 100644 (file)
--- a/icu4c/source/i18n/unicode/fmtable.h
+++ b/icu4c/source/i18n/unicode/fmtable.h
@@ -19,6 +19,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Formattable is a thin wrapper for primitive types used for formatting and parsing
@@ -751,5 +753,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif //_FMTABLE
 //eof

diff --git a/icu4c/source/i18n/unicode/format.h b/icu4c/source/i18n/unicode/format.h
index b05318dae7ba7fae70aeaa6acac262ecdc1d3224..96883a81a2ed95be7408299950be8a7caeacefe8 100644 (file)
--- a/icu4c/source/i18n/unicode/format.h
+++ b/icu4c/source/i18n/unicode/format.h
@@ -26,6 +26,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: Base class for all formats. 
@@ -303,5 +305,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _FORMAT
 //eof

diff --git a/icu4c/source/i18n/unicode/formattedvalue.h b/icu4c/source/i18n/unicode/formattedvalue.h
index 60f97edd4b2686865b1b018ac8de82e31b1bc17d..0a63bb58a08d2558e3b8e92927ca6fc2fb8e0c56 100644 (file)
--- a/icu4c/source/i18n/unicode/formattedvalue.h
+++ b/icu4c/source/i18n/unicode/formattedvalue.h
@@ -5,6 +5,9 @@
 #define __FORMATTEDVALUE_H__
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 #ifndef U_HIDE_DRAFT_API
 
@@ -314,4 +317,7 @@ U_NAMESPACE_END
 
 #endif  /* U_HIDE_DRAFT_API */
 #endif /* #if !UCONFIG_NO_FORMATTING */
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __FORMATTEDVALUE_H__

diff --git a/icu4c/source/i18n/unicode/fpositer.h b/icu4c/source/i18n/unicode/fpositer.h
index d9c8eff511b8855c0869dfc1a7d9da7b0ec9ba89..3e8a0108f16fbad286072b304ae5bad27f86524d 100644 (file)
--- a/icu4c/source/i18n/unicode/fpositer.h
+++ b/icu4c/source/i18n/unicode/fpositer.h
@@ -19,6 +19,9 @@
 #define FPOSITER_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 
 /**
@@ -116,4 +119,6 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // FPOSITER_H

diff --git a/icu4c/source/i18n/unicode/gender.h b/icu4c/source/i18n/unicode/gender.h
index d2773ebd051c490c0ebb53b3c413f2a4f49f79b4..cf7fee963e1fe81f84cf301b414a8e72a85d5c1b 100644 (file)
--- a/icu4c/source/i18n/unicode/gender.h
+++ b/icu4c/source/i18n/unicode/gender.h
@@ -25,6 +25,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/locid.h"
@@ -114,5 +116,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _GENDER
 //eof

diff --git a/icu4c/source/i18n/unicode/gregocal.h b/icu4c/source/i18n/unicode/gregocal.h
index 2b4fe1d879cadf36d8a150d0136690558da3cba5..8bfb8f48986699597fd13a75adfde8073ef46d47 100644 (file)
--- a/icu4c/source/i18n/unicode/gregocal.h
+++ b/icu4c/source/i18n/unicode/gregocal.h
@@ -28,6 +28,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/calendar.h"
@@ -774,6 +776,8 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _GREGOCAL
 //eof
 

diff --git a/icu4c/source/i18n/unicode/listformatter.h b/icu4c/source/i18n/unicode/listformatter.h
index 9ce8ec8617ce800d4ed03c26361026693ab72fa2..430274a914c06cd70d081f5e3c80250bdb1635d0 100644 (file)
--- a/icu4c/source/i18n/unicode/listformatter.h
+++ b/icu4c/source/i18n/unicode/listformatter.h
@@ -21,6 +21,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/unistr.h"
 #include "unicode/locid.h"
 #include "unicode/formattedvalue.h"
@@ -298,4 +300,6 @@ class U_I18N_API ListFormatter : public UObject{
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __LISTFORMATTER_H__

diff --git a/icu4c/source/i18n/unicode/measfmt.h b/icu4c/source/i18n/unicode/measfmt.h
index 12101d6e28bfe773f818af8f0fa4705b162247b1..fa962e1fb9cc413316b0c186d19aaec11ef58c71 100644 (file)
--- a/icu4c/source/i18n/unicode/measfmt.h
+++ b/icu4c/source/i18n/unicode/measfmt.h
@@ -15,6 +15,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/format.h"
@@ -395,4 +397,7 @@ class U_I18N_API MeasureFormat : public Format {
 U_NAMESPACE_END
 
 #endif // #if !UCONFIG_NO_FORMATTING
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // #ifndef MEASUREFORMAT_H

diff --git a/icu4c/source/i18n/unicode/measunit.h b/icu4c/source/i18n/unicode/measunit.h
index 93d9b079496ae80b05b07c386890c0d2f1fa15d7..0c049800d8c74fc75706afc57b8f219b59fe83c0 100644 (file)
--- a/icu4c/source/i18n/unicode/measunit.h
+++ b/icu4c/source/i18n/unicode/measunit.h
@@ -15,6 +15,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/unistr.h"
@@ -3164,4 +3166,7 @@ private:
 U_NAMESPACE_END
 
 #endif // !UNCONFIG_NO_FORMATTING
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __MEASUREUNIT_H__

diff --git a/icu4c/source/i18n/unicode/measure.h b/icu4c/source/i18n/unicode/measure.h
index 99b7d7a1439941af50281d9eaf2e9e9cd9018972..ea17a70988111ced620763d38a206cf0fbf95fb4 100644 (file)
--- a/icu4c/source/i18n/unicode/measure.h
+++ b/icu4c/source/i18n/unicode/measure.h
@@ -15,6 +15,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: MeasureUnit object.
@@ -158,4 +160,7 @@ inline const MeasureUnit& Measure::getUnit() const {
 U_NAMESPACE_END
 
 #endif // !UCONFIG_NO_FORMATTING
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __MEASURE_H__

diff --git a/icu4c/source/i18n/unicode/msgfmt.h b/icu4c/source/i18n/unicode/msgfmt.h
index c2f0738b111d9f21e653ac0103037ad1a0bb4351..e3db8e8033d0f5ca507edb03c49b783d8a591f91 100644 (file)
--- a/icu4c/source/i18n/unicode/msgfmt.h
+++ b/icu4c/source/i18n/unicode/msgfmt.h
@@ -21,6 +21,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Formats messages in a language-neutral way.
@@ -1111,5 +1113,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _MSGFMT
 //eof

diff --git a/icu4c/source/i18n/unicode/nounit.h b/icu4c/source/i18n/unicode/nounit.h
index 879849b16bd8e0be19dc2d794b3917055b39312a..de33fbbc947a48d686cc10371cf96169eb86b81f 100644 (file)
--- a/icu4c/source/i18n/unicode/nounit.h
+++ b/icu4c/source/i18n/unicode/nounit.h
@@ -12,6 +12,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 #ifndef U_HIDE_DRAFT_API
 
@@ -106,6 +108,8 @@ U_NAMESPACE_END
 #endif  /* U_HIDE_DRAFT_API */
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __NOUNIT_H__
 //eof
 //

diff --git a/icu4c/source/i18n/unicode/numberformatter.h b/icu4c/source/i18n/unicode/numberformatter.h
index c8c20f40181c0e0e2db894f97f50f933d302f09e..e5b85fe39544853eecc8464ee7ceb2bc99bc3bb4 100644 (file)
--- a/icu4c/source/i18n/unicode/numberformatter.h
+++ b/icu4c/source/i18n/unicode/numberformatter.h
@@ -1,11 +1,14 @@
 // © 2017 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 
+#ifndef __NUMBERFORMATTER_H__
+#define __NUMBERFORMATTER_H__
+
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
-#ifndef __NUMBERFORMATTER_H__
-#define __NUMBERFORMATTER_H__
 
 #include "unicode/appendable.h"
 #include "unicode/dcfmtsym.h"
@@ -2631,6 +2634,9 @@ U_NAMESPACE_END
 
 #endif  // U_HIDE_DRAFT_API
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __NUMBERFORMATTER_H__
 
-#endif /* #if !UCONFIG_NO_FORMATTING */

diff --git a/icu4c/source/i18n/unicode/numberrangeformatter.h b/icu4c/source/i18n/unicode/numberrangeformatter.h
index a67ee72666ea8a86e1de91b8e17104b5b334eeae..c75a23f46ea640c2c0f5826c50d8ad280e935a3f 100644 (file)
--- a/icu4c/source/i18n/unicode/numberrangeformatter.h
+++ b/icu4c/source/i18n/unicode/numberrangeformatter.h
@@ -1,10 +1,15 @@
 // © 2018 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 
-#if !UCONFIG_NO_FORMATTING
 #ifndef __NUMBERRANGEFORMATTER_H__
 #define __NUMBERRANGEFORMATTER_H__
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
+#if !UCONFIG_NO_FORMATTING
+
 #include <atomic>
 #include "unicode/appendable.h"
 #include "unicode/fieldpos.h"
@@ -902,6 +907,9 @@ U_NAMESPACE_END
 
 #endif  // U_HIDE_DRAFT_API
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __NUMBERRANGEFORMATTER_H__
 
-#endif /* #if !UCONFIG_NO_FORMATTING */

diff --git a/icu4c/source/i18n/unicode/numfmt.h b/icu4c/source/i18n/unicode/numfmt.h
index ba2b7d1964baeb430d2dc03bae3ee181b764354b..c06f87b08821c45ff29e136aa33e5afdd5a29aef 100644 (file)
--- a/icu4c/source/i18n/unicode/numfmt.h
+++ b/icu4c/source/i18n/unicode/numfmt.h
@@ -26,6 +26,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Compatibility APIs for number formatting.
@@ -1255,5 +1257,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _NUMFMT
 //eof

diff --git a/icu4c/source/i18n/unicode/numsys.h b/icu4c/source/i18n/unicode/numsys.h
index 0ced6f4cfa6f68701e746a997c5fe1b900cf362e..b2b16fa0d0e72361a984cf135cb62bd7c09573e0 100644 (file)
--- a/icu4c/source/i18n/unicode/numsys.h
+++ b/icu4c/source/i18n/unicode/numsys.h
@@ -20,6 +20,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: NumberingSystem object
@@ -210,5 +212,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _NUMSYS
 //eof

diff --git a/icu4c/source/i18n/unicode/plurfmt.h b/icu4c/source/i18n/unicode/plurfmt.h
index cb901b0c7b5becc41fdf3a9b5de52adfdc7741c1..1900b182073280ed6c60ca00fff3446f7d2d2979 100644 (file)
--- a/icu4c/source/i18n/unicode/plurfmt.h
+++ b/icu4c/source/i18n/unicode/plurfmt.h
@@ -16,6 +16,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: PluralFormat object
@@ -601,5 +603,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _PLURFMT
 //eof

diff --git a/icu4c/source/i18n/unicode/plurrule.h b/icu4c/source/i18n/unicode/plurrule.h
index 04bf3970ba08257d4ac4dfca0c1c5d258c46f904..610f288708a9eb9881e1d0946317ac5525b3644d 100644 (file)
--- a/icu4c/source/i18n/unicode/plurrule.h
+++ b/icu4c/source/i18n/unicode/plurrule.h
@@ -18,6 +18,8 @@
 #ifndef PLURRULE
 #define PLURRULE
 
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/utypes.h"
 
 /**
@@ -533,5 +535,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _PLURRULE
 //eof

diff --git a/icu4c/source/i18n/unicode/rbnf.h b/icu4c/source/i18n/unicode/rbnf.h
index d6ba523b7805f91b5814f1388285ad35818e7f50..de6b8ed1eb98266ab76e2340881b9fdd71447d35 100644 (file)
--- a/icu4c/source/i18n/unicode/rbnf.h
+++ b/icu4c/source/i18n/unicode/rbnf.h
@@ -12,6 +12,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Rule Based Number Format
@@ -1135,5 +1137,7 @@ U_NAMESPACE_END
 /* U_HAVE_RBNF */
 #endif
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 /* RBNF_H */
 #endif

diff --git a/icu4c/source/i18n/unicode/rbtz.h b/icu4c/source/i18n/unicode/rbtz.h
index 6d652f692b221eaf6102161c6c8fd2034f08376d..3884a97894080ce58ad7e9258273b7a2724ba819 100644 (file)
--- a/icu4c/source/i18n/unicode/rbtz.h
+++ b/icu4c/source/i18n/unicode/rbtz.h
@@ -11,6 +11,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: Rule based customizable time zone
@@ -359,6 +361,8 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // RBTZ_H
 
 //eof

diff --git a/icu4c/source/i18n/unicode/regex.h b/icu4c/source/i18n/unicode/regex.h
index 07c5927afbf03e795c95a4d35540c9cf05f4f21c..69fb7ecd093ce792b50483f64d6cde611951429d 100644 (file)
--- a/icu4c/source/i18n/unicode/regex.h
+++ b/icu4c/source/i18n/unicode/regex.h
@@ -44,6 +44,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS
 
 #include "unicode/uobject.h"
@@ -1876,4 +1878,7 @@ private:
 
 U_NAMESPACE_END
 #endif  // UCONFIG_NO_REGULAR_EXPRESSIONS
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/i18n/unicode/region.h b/icu4c/source/i18n/unicode/region.h
index 4014025f6f237155f031d3d7bb2e4830989a5625..9ec8dd45156f0934a0a3cfcbb4424d2cf61c3443 100644 (file)
--- a/icu4c/source/i18n/unicode/region.h
+++ b/icu4c/source/i18n/unicode/region.h
@@ -16,10 +16,12 @@
  */
 
 #include "unicode/utypes.h"
-#include "unicode/uregion.h"
+
+#if U_SHOW_CPLUSPLUS_API
 
 #if !UCONFIG_NO_FORMATTING
 
+#include "unicode/uregion.h"
 #include "unicode/uobject.h"
 #include "unicode/uniset.h"
 #include "unicode/unistr.h"
@@ -219,6 +221,9 @@ private:
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // REGION_H
 
 //eof

diff --git a/icu4c/source/i18n/unicode/reldatefmt.h b/icu4c/source/i18n/unicode/reldatefmt.h
index 1e164a581a2d297ba7781d0e8a7cc4c22b732aa3..a316244bc6b6d612d3d4501dd1c6a7c14d4efb83 100644 (file)
--- a/icu4c/source/i18n/unicode/reldatefmt.h
+++ b/icu4c/source/i18n/unicode/reldatefmt.h
@@ -15,6 +15,9 @@
 #define __RELDATEFMT_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/uobject.h"
 #include "unicode/udisplaycontext.h"
 #include "unicode/ureldatefmt.h"
@@ -744,4 +747,7 @@ U_NAMESPACE_END
 
 #endif /* !UCONFIG_NO_BREAK_ITERATION */
 #endif /* !UCONFIG_NO_FORMATTING */
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif /* __RELDATEFMT_H */

diff --git a/icu4c/source/i18n/unicode/scientificnumberformatter.h b/icu4c/source/i18n/unicode/scientificnumberformatter.h
index 6c34d2ce29a416c960fdd5b855fc6f7114f356d9..cd358dc754e98f0465d9a0895c9590fe78413513 100644 (file)
--- a/icu4c/source/i18n/unicode/scientificnumberformatter.h
+++ b/icu4c/source/i18n/unicode/scientificnumberformatter.h
@@ -11,6 +11,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 
@@ -214,4 +216,7 @@ U_NAMESPACE_END
 
 
 #endif /* !UCONFIG_NO_FORMATTING */
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif 

diff --git a/icu4c/source/i18n/unicode/search.h b/icu4c/source/i18n/unicode/search.h
index 65f7f10bcc1c5c6065be7a8e9a6e95b1b128d793..2a2195627dd6a36f217f1f2f68a14a9fe4071321 100644 (file)
--- a/icu4c/source/i18n/unicode/search.h
+++ b/icu4c/source/i18n/unicode/search.h
@@ -14,6 +14,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: SearchIterator object.
@@ -573,5 +575,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_COLLATION */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif
 

diff --git a/icu4c/source/i18n/unicode/selfmt.h b/icu4c/source/i18n/unicode/selfmt.h
index 08e9d444ee9715a2a4b52c16a3795276894acb59..f30aab0258aeb1f131dca2e4483b78d5bac03257 100755 (executable)
--- a/icu4c/source/i18n/unicode/selfmt.h
+++ b/icu4c/source/i18n/unicode/selfmt.h
@@ -18,9 +18,12 @@
 #ifndef SELFMT
 #define SELFMT
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/messagepattern.h"
 #include "unicode/numfmt.h"
-#include "unicode/utypes.h"
 
 /**
  * \file
@@ -365,5 +368,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _SELFMT
 //eof

diff --git a/icu4c/source/i18n/unicode/simpletz.h b/icu4c/source/i18n/unicode/simpletz.h
index 3ae08077e3b7f2284c5b2f7196390e7e6e3b1514..34263b6a2de87b841b36d3a782a0a872f7c74d65 100644 (file)
--- a/icu4c/source/i18n/unicode/simpletz.h
+++ b/icu4c/source/i18n/unicode/simpletz.h
@@ -28,6 +28,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: SimpleTimeZone is a concrete subclass of TimeZone.
@@ -929,4 +931,6 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _SIMPLETZ

diff --git a/icu4c/source/i18n/unicode/smpdtfmt.h b/icu4c/source/i18n/unicode/smpdtfmt.h
index a015c5be5c877a193deae7a955b6c1922878ec7c..e7299cb691a9cecb094f5df47f8fcbcfcb63726c 100644 (file)
--- a/icu4c/source/i18n/unicode/smpdtfmt.h
+++ b/icu4c/source/i18n/unicode/smpdtfmt.h
@@ -28,6 +28,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Format and parse dates in a language-independent manner.
@@ -1656,5 +1658,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _SMPDTFMT
 //eof

diff --git a/icu4c/source/i18n/unicode/sortkey.h b/icu4c/source/i18n/unicode/sortkey.h
index 1f4246018f00f21441b9018556f4105dbb6494d7..34ed7ee69217fb8c64275fce82263fa95e3b0293 100644 (file)
--- a/icu4c/source/i18n/unicode/sortkey.h
+++ b/icu4c/source/i18n/unicode/sortkey.h
@@ -25,6 +25,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: Keys for comparing strings multiple times. 
@@ -337,4 +339,6 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_COLLATION */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/i18n/unicode/stsearch.h b/icu4c/source/i18n/unicode/stsearch.h
index 57b5b321e90d91db35f38985ff535cc4dcb3b68b..410495f7a33bda0ac8d90fd7afd35a8932523835 100644 (file)
--- a/icu4c/source/i18n/unicode/stsearch.h
+++ b/icu4c/source/i18n/unicode/stsearch.h
@@ -14,6 +14,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: Service for searching text based on RuleBasedCollator.
@@ -502,5 +504,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_COLLATION */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif
 

diff --git a/icu4c/source/i18n/unicode/tblcoll.h b/icu4c/source/i18n/unicode/tblcoll.h
index 24ba213b41eacc1181f1926f4d11da467a77f24d..35adba81f472ab7280d18798106fd8957c911453 100644 (file)
--- a/icu4c/source/i18n/unicode/tblcoll.h
+++ b/icu4c/source/i18n/unicode/tblcoll.h
@@ -64,6 +64,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_COLLATION
 
 #include "unicode/coll.h"
@@ -874,4 +876,7 @@ private:
 U_NAMESPACE_END
 
 #endif  // !UCONFIG_NO_COLLATION
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif  // TBLCOLL_H

diff --git a/icu4c/source/i18n/unicode/timezone.h b/icu4c/source/i18n/unicode/timezone.h
index ede0c4896dfbd18954bee438b3e7bc70e9e67d8c..badd26c0f805aff0a7cbe9c522d613fa1cb2814a 100644 (file)
--- a/icu4c/source/i18n/unicode/timezone.h
+++ b/icu4c/source/i18n/unicode/timezone.h
@@ -31,6 +31,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: TimeZone object
@@ -966,5 +968,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif //_TIMEZONE
 //eof

diff --git a/icu4c/source/i18n/unicode/tmunit.h b/icu4c/source/i18n/unicode/tmunit.h
index fa59f104734baa33f6299aa7f762d3f990326b34..2c4d9da78ee24ce98bc08231a36aeef09ce0c1c2 100644 (file)
--- a/icu4c/source/i18n/unicode/tmunit.h
+++ b/icu4c/source/i18n/unicode/tmunit.h
@@ -16,6 +16,9 @@
  * \brief C++ API: time unit object
  */
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
 
 #include "unicode/measunit.h"
 
@@ -132,6 +135,8 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __TMUNIT_H__
 //eof
 //

diff --git a/icu4c/source/i18n/unicode/tmutamt.h b/icu4c/source/i18n/unicode/tmutamt.h
index 274bfa6f23fb0d99cc2194381df0a3fd6f7f533b..b5409965b6f4ce2d57898641c1ecfe2cfaf68315 100644 (file)
--- a/icu4c/source/i18n/unicode/tmutamt.h
+++ b/icu4c/source/i18n/unicode/tmutamt.h
@@ -16,11 +16,15 @@
  * \brief C++ API: time unit amount object.
  */
 
-#include "unicode/measure.h"
-#include "unicode/tmunit.h"
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
 
 #if !UCONFIG_NO_FORMATTING
 
+#include "unicode/measure.h"
+#include "unicode/tmunit.h"
+
 U_NAMESPACE_BEGIN
 
 
@@ -165,6 +169,8 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __TMUTAMT_H__
 //eof
 //

diff --git a/icu4c/source/i18n/unicode/tmutfmt.h b/icu4c/source/i18n/unicode/tmutfmt.h
index 8f245859a622bafbfc345b5c6b9ceecae70f81fe..b92029cc1c72df7fc03189f37e0b30795df78ca5 100644 (file)
--- a/icu4c/source/i18n/unicode/tmutfmt.h
+++ b/icu4c/source/i18n/unicode/tmutfmt.h
@@ -18,6 +18,8 @@
  */
 
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 #ifndef U_HIDE_DEPRECATED_API
 
@@ -244,5 +246,7 @@ U_NAMESPACE_END
 #endif /* U_HIDE_DEPRECATED_API */
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __TMUTFMT_H__
 //eof

diff --git a/icu4c/source/i18n/unicode/translit.h b/icu4c/source/i18n/unicode/translit.h
index 6b4888145f1be51364b0500af25c080bad9f9c22..fe2568d50aa0205610ce38f878dc9cf80787e9f0 100644 (file)
--- a/icu4c/source/i18n/unicode/translit.h
+++ b/icu4c/source/i18n/unicode/translit.h
@@ -14,6 +14,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Tranforms text from one format to another.
@@ -1588,4 +1590,6 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_TRANSLITERATION */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/i18n/unicode/tzfmt.h b/icu4c/source/i18n/unicode/tzfmt.h
index d2aa768b8c8b34df47633a9d30d516c3b576cfdc..070fcd314e83306b02ec9108532b683ab8b4983d 100644 (file)
--- a/icu4c/source/i18n/unicode/tzfmt.h
+++ b/icu4c/source/i18n/unicode/tzfmt.h
@@ -16,6 +16,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/format.h"
@@ -1094,4 +1096,7 @@ private:
 U_NAMESPACE_END
 
 #endif /* !UCONFIG_NO_FORMATTING */
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/i18n/unicode/tznames.h b/icu4c/source/i18n/unicode/tznames.h
index 399265d85ae66cb8b8489b58c5a355e03f4466c1..860494221df4f8625630d9ce87a09095b7412d3e 100644 (file)
--- a/icu4c/source/i18n/unicode/tznames.h
+++ b/icu4c/source/i18n/unicode/tznames.h
@@ -15,6 +15,8 @@
  */
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/uloc.h"
@@ -411,4 +413,7 @@ public:
 U_NAMESPACE_END
 
 #endif
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/i18n/unicode/tzrule.h b/icu4c/source/i18n/unicode/tzrule.h
index 1647fda703ee687e433e0773e68f047f54ce2306..6cce299bef9ac9c0e1b5d67927b49bb1f497cccd 100644 (file)
--- a/icu4c/source/i18n/unicode/tzrule.h
+++ b/icu4c/source/i18n/unicode/tzrule.h
@@ -16,6 +16,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/uobject.h"
@@ -825,6 +827,8 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // TZRULE_H
 
 //eof

diff --git a/icu4c/source/i18n/unicode/tztrans.h b/icu4c/source/i18n/unicode/tztrans.h
index a476c68c8f751fc74b7403cf046c6d2de99b5bf2..34f9a9135a9be4af5d3569311695e12022c8b9a5 100644 (file)
--- a/icu4c/source/i18n/unicode/tztrans.h
+++ b/icu4c/source/i18n/unicode/tztrans.h
@@ -16,6 +16,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/uobject.h"
@@ -192,6 +194,8 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // TZTRANS_H
 
 //eof

diff --git a/icu4c/source/i18n/unicode/unirepl.h b/icu4c/source/i18n/unicode/unirepl.h
index ddcb0ad0e8ed0ca1f848aa309be4366d468a2603..1ec627abcb9ce451f44ca12c1b90317efc81ca2b 100644 (file)
--- a/icu4c/source/i18n/unicode/unirepl.h
+++ b/icu4c/source/i18n/unicode/unirepl.h
@@ -14,6 +14,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: UnicodeReplacer
@@ -96,4 +98,6 @@ class U_I18N_API UnicodeReplacer /* not : public UObject because this is an inte
 
 U_NAMESPACE_END
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/i18n/unicode/vtzone.h b/icu4c/source/i18n/unicode/vtzone.h
index 18265d341505cb0a63a292224003b3ae708f4712..f2400903da0ab45447bac61c3f990e8bc71ec963 100644 (file)
--- a/icu4c/source/i18n/unicode/vtzone.h
+++ b/icu4c/source/i18n/unicode/vtzone.h
@@ -11,6 +11,8 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file 
  * \brief C++ API: RFC2445 VTIMEZONE support
@@ -453,5 +455,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // VTZONE_H
 //eof

diff --git a/icu4c/source/io/unicode/ustream.h b/icu4c/source/io/unicode/ustream.h
index c10ce6a2de513827b2b4837b79cb7296f4ff00c3..927342cb0313a429fe49d3a658fbd010f3460ad8 100644 (file)
--- a/icu4c/source/io/unicode/ustream.h
+++ b/icu4c/source/io/unicode/ustream.h
@@ -17,6 +17,10 @@
 #ifndef USTREAM_H
 #define USTREAM_H
 
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 #include "unicode/unistr.h"
 
 #if !UCONFIG_NO_CONVERSION  // not available without conversion
@@ -60,4 +64,6 @@ U_NAMESPACE_END
 
 /* No operator for UChar because it can conflict with wchar_t  */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif

diff --git a/icu4c/source/test/hdrtst/Makefile.in b/icu4c/source/test/hdrtst/Makefile.in
index 55e833943d57b2646fd005d054f0efed8db7608e..60a8e72a67734c8ee208de660deda7173a1494da 100644 (file)
--- a/icu4c/source/test/hdrtst/Makefile.in
+++ b/icu4c/source/test/hdrtst/Makefile.in
@@ -17,9 +17,8 @@
 ##
 ##    .. etc.  Anything other than zero is an error. (except for the deprecation tests, where '1' is the correct value)
 ##              
-##
-##  If a header fails the C compile because it's a C++ header, add it to the
-##  file named 'cxxfiles.txt' in this directory.
+##  If a header fails the C compile test it is likely because the header is a
+##  C++ header and isn't properly guarded by the U_SHOW_CPLUSPLUS_API macro.
 ##
 ##  If a header fails because it is deprecated, add it to the 'dfiles.txt'
 ##
@@ -33,135 +32,84 @@ top_builddir = ../..
 subdir = test/hdrtst
 
 include $(shell icu-config --incfile)
-DIRS=$(prefix)/include/unicode
-LDIRS=$(prefix)/include/layout
-ECHO_T=@ECHO_T@
-ECHO_C=@ECHO_C@
-ECHO_N=@ECHO_N@
 
 all: 
        @echo Please read this Makefile for more information.
        @echo run \'$(MAKE) check\' to run the test "(use -k if you don't want to stop on errs)"
 
-E_NUM=8
-E_D="[1/$(E_NUM)] Deprecated: "
-E_C="[2/$(E_NUM)] C  : "
-E_CXX="[3/$(E_NUM)] C++: "
-E_CXX_L="[4/$(E_NUM)] C++ layout: "
-E_DRF="[5/$(E_NUM)] Hide Draft: "
-E_DEP="[6/$(E_NUM)] Hide Deprecated: "
-E_INT="[7/$(E_NUM)] Hide Internal: "
-E_OBS="[8/$(E_NUM)] Hide Obsolete: "
-
-check: dtest ctest cpptest doclean drafttest deprtest internaltest obsoletetest
-ifeq ($(MAKECMDGOALS),check)
-       $(MAKE) clean
-else
-       @echo "(not cleaning automatically)"
-endif
-
-# break dependency
-doclean:
-       make clean
-
-cpptest:
-       @FAIL=0;for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/pfiles.txt`; do \
-         incfile=`basename $$file .h` ; \
-         echo "$@ unicode/$$incfile.h" ; \
-         echo '#include "'unicode/$$incfile'.h"' > ht_$$incfile.cpp ; \
-         echo 'void junk(){}' >> ht_$$incfile.cpp ; \
-          $(COMPILE.cc) -c $(cppflags) ht_$$incfile.cpp || FAIL=1 ; \
-       done ;\
-       exit $$FAIL
-
-# layout is removed
+check: dtest ctest cpptest drafttest deprtest internaltest obsoletetest
 
-dtest:
-       @FAIL=0;NONE="(No deprecated headers)";for stub in `cat $(srcdir)/dfiles.txt | grep -v '^#'` ; do \
-         file=unicode/$$stub ; \
-         NONE="" ; \
-         incfile=`basename $$file .h` ; \
-         echo "$@ unicode/$$incfile.h" ; \
-         echo '#include "'unicode/$$incfile'.h"' > ht_$$incfile.cpp ; \
-         echo 'void junk(){}' >> ht_$$incfile.cpp ; \
-         echo > ht_dep.junk ; \
-          $(COMPILE.cc) -c $(cppflags) ht_$$incfile.cpp 2>&1 | sed -e 's/^.*#error[^"]*"//' | fgrep -v ht_ | tee ht_dep.junk | fgrep -v "$$incfile.h header is obsolete" ; \
-         RES=$$? ; \
-         echo $$RES ; \
-         fgrep -q "$$incfile.h header is obsolete" ht_dep.junk || echo "** FAIL Header unicode/$$incfile.h is not obsoleted properly" ; \
-         fgrep -q "$$incfile.h header is obsolete" ht_dep.junk || FAIL=1 ; \
-         rm -f unicode/$$stub ; \
+headertest:
+       @FAIL=0;stub=ht_stub_$(NAME.headers).$(SUFFIX.headers); for file in "$(prefix)/include/unicode"/*.h ; do \
+               incfile=`basename $$file` ; \
+               echo "$(NAME.headers) unicode/$$incfile" ; \
+               echo "#include <unicode/$$incfile>" > $$stub ; \
+               echo 'void junk(){}' >> $$stub ; \
+               $(COMPILE.headers) $(cppflags) $(FLAGS.headers) $$stub || FAIL=1 ; \
+               rm -f $$stub; \
        done ; \
-       echo "$@: $$NONE - exit status $$FAIL" ; \
        exit $$FAIL
 
-#  < ht_dep.junk &&  ; \
-
-
 ctest:
-       @echo Building test harness for header files in ../../common and ../../i18n
-       @FAIL=0;for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/cxxfiles.txt | tee cfiles.txt`; do \
-         incfile=`basename $$file .h` ; \
-         echo "$@ unicode/$$incfile.h" ; \
-         echo '#include "'unicode/$$incfile'.h"' > ht_$$incfile.c ; \
-         echo 'void junk(void);' >> ht_$$incfile.c ; \
-         echo 'void junk(){}' >> ht_$$incfile.c ; \
-          $(COMPILE.c) -c $(cppflags) ht_$$incfile.c || FAIL=1 ; \
-       done ;\
-       exit $$FAIL
+       $(MAKE) headertest \
+               NAME.headers=$@ \
+               COMPILE.headers="$(COMPILE.c)" \
+               SUFFIX.headers=c \
+               FLAGS.headers=
+
+cpptest:
+       $(MAKE) headertest \
+               NAME.headers=$@ \
+               COMPILE.headers="$(COMPILE.cc)" \
+               SUFFIX.headers=cpp \
+               FLAGS.headers=
 
 drafttest:
-       @FAIL=0;for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/pfiles.txt`; do \
-         incfile=`basename $$file .h` ; \
-         echo "$@ unicode/$$incfile.h" ; \
-         echo '#define U_HIDE_DRAFT_API' > hd_$$incfile.cpp ; \
-         echo '#include "'unicode/$$incfile'.h"' >> hd_$$incfile.cpp ; \
-         echo 'void junk(void);' >> hd_$$incfile.cpp ; \
-         echo 'void junk(){}' >> hd_$$incfile.cpp ; \
-          $(COMPILE.cc) -c $(cppflags) hd_$$incfile.cpp ||FAIL=1 ; \
-       done ;\
-       exit $$FAIL
+       $(MAKE) headertest \
+               NAME.headers=$@ \
+               COMPILE.headers="$(COMPILE.cc)" \
+               SUFFIX.headers=cpp \
+               FLAGS.headers="-DU_HIDE_DRAFT_API"
 
 deprtest:
-       @FAIL=0; for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/pfiles.txt`; do \
-         incfile=`basename $$file .h` ; \
-         echo "$@ unicode/$$incfile.h" ; \
-         echo '#define U_HIDE_DEPRECATED_API' > hdp_$$incfile.cpp ; \
-         echo '#include "'unicode/$$incfile'.h"' >> hdp_$$incfile.cpp ; \
-         echo 'void junk(void);' >> hdp_$$incfile.cpp ; \
-         echo 'void junk(){}' >> hdp_$$incfile.cpp ; \
-          $(COMPILE.cc) -c $(cppflags) hdp_$$incfile.cpp || FAIL=1; \
-       done ; \
-       exit $$FAIL
+       $(MAKE) headertest \
+               NAME.headers=$@ \
+               COMPILE.headers="$(COMPILE.cc)" \
+               SUFFIX.headers=cpp \
+               FLAGS.headers="-DU_HIDE_DEPRECATED_API"
 
 internaltest:
-       @FAIL=0;\
-        for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/pfiles.txt`; do \
-         incfile=`basename $$file .h` ; \
-         echo "$@ unicode/$$incfile.h" ; \
-         echo '#define U_HIDE_INTERNAL_API' > hin_$$incfile.cpp ; \
-         echo '#include "'unicode/$$incfile'.h"' >> hin_$$incfile.cpp ; \
-         echo 'void junk(void);' >> hin_$$incfile.cpp ; \
-         echo 'void junk(){}' >> hin_$$incfile.cpp ; \
-          $(COMPILE.cc) -c $(cppflags) hin_$$incfile.cpp || FAIL=1 ; \
-       done ; \
-       exit $$FAIL
+       $(MAKE) headertest \
+               NAME.headers=$@ \
+               COMPILE.headers="$(COMPILE.cc)" \
+               SUFFIX.headers=cpp \
+               FLAGS.headers="-DU_HIDE_INTERNAL_API"
 
 obsoletetest:
-       @FAIL=0;for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/pfiles.txt`; do \
-         incfile=`basename $$file .h` ; \
-         echo "$@ unicode/$$incfile.h" ; \
-         echo '#define U_HIDE_OBSOLETE_API' > hob_$$incfile.cpp ; \
-         echo '#include "'unicode/$$incfile'.h"' >> hob_$$incfile.cpp ; \
-         echo 'void junk(void);' >> hob_$$incfile.cpp ; \
-         echo 'void junk(){}' >> hob_$$incfile.cpp ; \
-          $(COMPILE.cc) -c $(cppflags) hob_$$incfile.cpp || FAIL=1 ; \
+       $(MAKE) headertest \
+               NAME.headers=$@ \
+               COMPILE.headers="$(COMPILE.cc)" \
+               SUFFIX.headers=cpp \
+               FLAGS.headers="-DU_HIDE_OBSOLETE_API"
+
+dtest:
+       @FAIL=0;NONE="(No deprecated headers)";stub=ht_stub_dtest.cpp;for incfile in `cat $(srcdir)/dfiles.txt | grep -v '^#' | sort` ; do \
+               NONE= ; \
+               echo "$@ unicode/$$incfile" ; \
+               echo "#include <unicode/$$incfile>" > $$stub ; \
+               echo 'void junk(){}' >> $$stub ; \
+               $(COMPILE.cc) $(cppflags) $$stub 2>&1 | tee $$stub.out || FAIL=1 ; \
+               if ! cat $$stub.out | sed -e 's/^.*#error[^"]*"//' | grep -v ht_ | grep -v "$$incfile header is obsolete"; then \
+                       echo "** FAIL Header unicode/$$incfile is not obsoleted properly" ; \
+                       FAIL=1 ; \
+               fi ; \
+               rm -f $$stub*; \
        done ; \
+       echo "$@: $$NONE - exit status $$FAIL" ; \
        exit $$FAIL
 
 clean:
-       -@echo cleaning..
-       -@rm -f *.h *.c *.cpp *.o *.junk cfiles.txt
+       -@rm -f ht_*
 
 distclean: clean
        -@rm -f Makefile
@@ -170,5 +118,4 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) \
        && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-.PHONY:        doclean check all cpptest dtest ctest clean distclean
-
+.PHONY:        doclean check all headertest cpptest dtest ctest clean distclean

diff --git a/icu4c/source/test/hdrtst/cxxfiles.txt b/icu4c/source/test/hdrtst/cxxfiles.txt
deleted file mode 100644 (file)
index 02151de..0000000
--- a/icu4c/source/test/hdrtst/cxxfiles.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright (C) 2016 and later: Unicode, Inc. and others.
-# License & terms of use: http://www.unicode.org/copyright.html
-# Copyright (c) 2001-2016 International Business Machines
-# Corporation and others. All Rights Reserved.
-# Begin temporary addition.
-# These are very bad "C" APIs that do not work with a C compiler and
-# violate many ICU coding guidelines. These were added with ticket #5996.
-# Temporarily marked as C++ for the hdrtst to pass.
-# These are gone in ICU 50.1, remove
-#vzone.h
-#zrule.h
-#ztrans.h
-# End temporary addition.
-# common & i18n
-alphaindex.h
-appendable.h
-bidi.h
-basictz.h
-bmsearch.h
-brkiter.h
-bytestream.h
-bytestrie.h
-bytestriebuilder.h
-calendar.h
-caniter.h
-casemap.h
-char16ptr.h
-chariter.h
-choicfmt.h
-coleitr.h
-coll.h
-colldata.h
-compactdecimalformat.h
-convert.h
-cpdtrans.h
-curramt.h
-currunit.h
-currpinf.h
-datefmt.h
-dbbi.h
-dcfmtsym.h
-decimfmt.h
-dtintrv.h
-dtitvinf.h
-dtitvfmt.h
-dtfmtsym.h
-dtptngen.h
-dtrule.h
-edits.h
-enumset.h
-errorcode.h
-fieldpos.h
-filteredbrk.h
-fmtable.h
-format.h
-formattedvalue.h
-fpositer.h
-gender.h
-gregocal.h
-idna.h
-listformatter.h
-localebuilder.h
-locdspnm.h
-locid.h
-measfmt.h
-measunit.h
-measure.h
-messagepattern.h
-msgfmt.h
-normalizer2.h
-normlzr.h
-nounit.h
-numberformatter.h
-numberrangeformatter.h
-numfmt.h
-numsys.h
-parsepos.h
-plurfmt.h
-plurrule.h
-rbbi.h
-rbnf.h
-rbtz.h
-regex.h
-region.h
-reldatefmt.h
-rep.h
-resbund.h
-schriter.h
-scientificformathelper.h
-scientificnumberformatter.h
-search.h
-selfmt.h
-simpleformatter.h
-simpletz.h
-smpdtfmt.h
-sortkey.h
-std_string.h
-strenum.h
-stringtriebuilder.h
-stringpiece.h
-stsearch.h
-symtable.h
-tblcoll.h
-timezone.h
-tmunit.h
-tmutamt.h
-tmutfmt.h
-translit.h
-tzfmt.h
-tznames.h
-tzrule.h
-tztrans.h
-ucharstrie.h
-ucharstriebuilder.h
-uchriter.h
-unifilt.h
-unifunct.h
-unimatch.h
-unirepl.h
-uniset.h
-unistr.h
-uobject.h
-usetiter.h
-vtzone.h
-# io library
-ustream.h
-# layout & layoutex
-LayoutEngine.h
-LEFontInstance.h
-LEGlyphFilter.h
-LEGlyphStorage.h
-LELanguages.h
-LEScripts.h
-LESwaps.h
-# LETypes.h -- C header
-# loengine.h -- C header
-ParagraphLayout.h
-RunArrays.h

diff --git a/icu4c/source/test/hdrtst/pfiles.txt b/icu4c/source/test/hdrtst/pfiles.txt
deleted file mode 100644 (file)
index 7b20c49..0000000
--- a/icu4c/source/test/hdrtst/pfiles.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (C) 2016 and later: Unicode, Inc. and others.
-# License & terms of use: http://www.unicode.org/copyright.html
-# Copyright (c) 2001-2016 International Business Machines 
-# Corporation and others. All Rights Reserved.
-# ICU 49 and later: no more platform-specific headers