ICU-66108.tar.gz

[apple/icu.git] / icuSources / common / unicode / ucnv.h

diff --git a/icuSources/common/unicode/ucnv.h b/icuSources/common/unicode/ucnv.h
index ebe4db53f0695efd1371b164b97699755bf75c07..ec7c5f350b497378298874dd869a837137964352 100644 (file)
--- a/icuSources/common/unicode/ucnv.h
+++ b/icuSources/common/unicode/ucnv.h
@@ -53,19 +53,18 @@
 #include "unicode/uenum.h"
 #include "unicode/localpointer.h"
 
-#ifndef __USET_H__
+#if !defined(USET_DEFINED) && !defined(U_IN_DOXYGEN)
+
+#define USET_DEFINED
 
 /**
- * USet is the C API type for Unicode sets.
- * It is forward-declared here to avoid including the header file if related
+ * USet is the C API type corresponding to C++ class UnicodeSet.
+ * It is forward-declared here to avoid including unicode/uset.h file if related
  * conversion APIs are not used.
- * See unicode/uset.h
  *
  * @see ucnv_getUnicodeSet
- * @stable ICU 2.6
+ * @stable ICU 2.4
  */
-struct USet;
-/** @stable ICU 2.6 */
 typedef struct USet USet;
 
 #endif
@@ -587,7 +586,7 @@ U_DEFINE_LOCAL_OPEN_POINTER(LocalUConverterPointer, UConverter, ucnv_close);
 
 U_NAMESPACE_END
 
-#endif // U_SHOW_CPLUSPLUS_API
+#endif
 
 /**
  * Fills in the output parameter, subChars, with the substitution characters