diff --git a/icu4c/source/common/ucnv_err.h b/icu4c/source/common/ucnv_err.h index aabb0b32959..948f4c2cea4 100644 --- a/icu4c/source/common/ucnv_err.h +++ b/icu4c/source/common/ucnv_err.h @@ -39,7 +39,7 @@ #ifndef UCNV_ERR_H #define UCNV_ERR_H - +#include "ucnv.h" #include "utypes.h" diff --git a/icu4c/source/common/umutex.h b/icu4c/source/common/umutex.h index 627e38cc1dd..0ac1752b246 100644 --- a/icu4c/source/common/umutex.h +++ b/icu4c/source/common/umutex.h @@ -52,9 +52,6 @@ typedef void * Mutex; * mistake which silently slips through the compiler!! */ -/* Mutex data type. */ -typedef void *UMTX; - /* Lock a mutex. Pass in NULL if you want the (ick) Single Global Mutex. */ U_CAPI void U_EXPORT2 umtx_lock ( UMTX* mutex ); diff --git a/icu4c/source/common/utypes.h b/icu4c/source/common/utypes.h index 6cda108251e..5007ece9030 100644 --- a/icu4c/source/common/utypes.h +++ b/icu4c/source/common/utypes.h @@ -363,6 +363,12 @@ u_errorName(UErrorCode code); /* Include header for platform utilies */ /*===========================================================================*/ + + +/* Mutex data type. INTERNAL.*/ +typedef void *UMTX; + + #include "putil.h" #endif /* _UTYPES */