From 4fd10ba2b753d2fd3c08b446dd1133c1b199bf53 Mon Sep 17 00:00:00 2001
From: Peter Edberg <pedberg@unicode.org>
Date: Tue, 28 Sep 2021 22:22:18 -0700
Subject: [PATCH] ICU-21581 check non-stable API macros (mostly
 U_HIDE_INTERNAL_API)

---
 icu4c/source/common/unicode/uloc.h                | 2 +-
 icu4c/source/i18n/unicode/alphaindex.h            | 8 ++++----
 icu4c/source/i18n/unicode/dcfmtsym.h              | 2 +-
 icu4c/source/i18n/unicode/measunit.h              | 2 ++
 icu4c/source/i18n/unicode/numberrangeformatter.h  | 2 +-
 icu4c/source/i18n/unicode/unumberrangeformatter.h | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/icu4c/source/common/unicode/uloc.h b/icu4c/source/common/unicode/uloc.h
index 3addb847e7f..b0bdbe1b87f 100644
--- a/icu4c/source/common/unicode/uloc.h
+++ b/icu4c/source/common/unicode/uloc.h
@@ -841,7 +841,7 @@ typedef enum ULocAvailableType {
    * @internal
    */
   ULOC_AVAILABLE_COUNT
-#endif
+#endif  /* U_HIDE_INTERNAL_API */
 } ULocAvailableType;
 
 /**
diff --git a/icu4c/source/i18n/unicode/alphaindex.h b/icu4c/source/i18n/unicode/alphaindex.h
index 7ece138da4e..d0cdd817fba 100644
--- a/icu4c/source/i18n/unicode/alphaindex.h
+++ b/icu4c/source/i18n/unicode/alphaindex.h
@@ -647,7 +647,7 @@ public:
 private:
      /**
       * No Copy constructor.
-      * @internal
+      * @internal (private)
       */
      AlphabeticIndex(const AlphabeticIndex &other);
 
@@ -658,13 +658,13 @@ private:
 
     /**
      * No Equality operators.
-     * @internal
+     * @internal (private)
      */
      virtual bool operator==(const AlphabeticIndex& other) const;
 
     /**
      * Inequality operator.
-     * @internal
+     * @internal (private)
      */
      virtual bool operator!=(const AlphabeticIndex& other) const;
 
@@ -723,7 +723,7 @@ private:
     /**
      * Holds all user records before they are distributed into buckets.
      * Type of contents is (Record *)
-     * @internal
+     * @internal (private)
      */
     UVector  *inputList_;
 
diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h
index 3b1535dd16d..20a6aae13b2 100644
--- a/icu4c/source/i18n/unicode/dcfmtsym.h
+++ b/icu4c/source/i18n/unicode/dcfmtsym.h
@@ -174,7 +174,7 @@ public:
          * @internal
          */
         kApproximatelySignSymbol,
-#endif
+#endif  /* U_HIDE_INTERNAL_API */
         /** count symbol constants */
         kFormatSymbolCount = kExponentMultiplicationSymbol + 2
     };
diff --git a/icu4c/source/i18n/unicode/measunit.h b/icu4c/source/i18n/unicode/measunit.h
index d0b70212fcb..61da62e71f2 100644
--- a/icu4c/source/i18n/unicode/measunit.h
+++ b/icu4c/source/i18n/unicode/measunit.h
@@ -107,12 +107,14 @@ typedef enum UMeasurePrefix {
      */
     UMEASURE_PREFIX_YOTTA = UMEASURE_PREFIX_ONE + 24,
 
+#ifndef U_HIDE_INTERNAL_API
     /**
      * ICU use only.
      * Used to determine the set of base-10 SI prefixes.
      * @internal
      */
     UMEASURE_PREFIX_INTERNAL_MAX_SI = UMEASURE_PREFIX_YOTTA,
+#endif  /* U_HIDE_INTERNAL_API */
 
     /**
      * SI prefix: zetta, 10^21.
diff --git a/icu4c/source/i18n/unicode/numberrangeformatter.h b/icu4c/source/i18n/unicode/numberrangeformatter.h
index 00cfa234558..363f7d48cfe 100644
--- a/icu4c/source/i18n/unicode/numberrangeformatter.h
+++ b/icu4c/source/i18n/unicode/numberrangeformatter.h
@@ -648,7 +648,7 @@ class U_I18N_API FormattedNumberRange : public UMemory, public FormattedValue {
      */
     FormattedNumberRange()
         : fData(nullptr), fErrorCode(U_INVALID_STATE_ERROR) {}
-#endif
+#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Copying not supported; use move constructor instead.
diff --git a/icu4c/source/i18n/unicode/unumberrangeformatter.h b/icu4c/source/i18n/unicode/unumberrangeformatter.h
index e16849b761c..4e92fe29e25 100644
--- a/icu4c/source/i18n/unicode/unumberrangeformatter.h
+++ b/icu4c/source/i18n/unicode/unumberrangeformatter.h
@@ -193,7 +193,7 @@ typedef enum UNumberRangeIdentityResult {
      * @internal
      */
     UNUM_IDENTITY_RESULT_COUNT
-#endif
+#endif  /* U_HIDE_INTERNAL_API */
 
 } UNumberRangeIdentityResult;