From: Hyunjee Kim <hj0426.kim@samsung.com>
Date: Wed, 26 Jul 2017 07:51:53 +0000 (+0900)
Subject: Fix Uchar type due to ICU upgrade
X-Git-Tag: submit/tizen/20171212.053412^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b6637b2e0010ca614bb11dee667fa67be87e213;p=platform%2Fcore%2Fapi%2Fbase-utils.git

Fix Uchar type due to ICU upgrade

Change-Id: Ibc5b8413ed214282469ab0191aeeef2244b17b83
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>
---

diff --git a/src/include/utils_i18n_types.h b/src/include/utils_i18n_types.h
index 85e6c84..bbc536f 100644
--- a/src/include/utils_i18n_types.h
+++ b/src/include/utils_i18n_types.h
@@ -202,10 +202,25 @@ i18n_error_code_e;
  * @brief i18n_uchar.
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  */
+#if U_ICU_VERSION_MAJOR_NUM >= 59
+#if defined(U_COMBINED_IMPLEMENTATION) || defined(U_COMMON_IMPLEMENTATION) || \
+	defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION)
+// Inside the ICU library code, never configurable.
+typedef char16_t i18n_uchar;
+#elif defined(UCHAR_TYPE)
+typedef UCHAR_TYPE i18n_uchar;
+#elif defined(__cplusplus)
+typedef char16_t i18n_uchar;
+#else
+typedef uint16_t i18n_uchar;
+#endif
+
+#else //!(U_ICU_VERSION_MAJOR_NUM >= 59)
 #if defined(UCHAR_TYPE)
 typedef UCHAR_TYPE i18n_uchar;
 /* Not #elif U_HAVE_CHAR16_T -- because that is type-incompatible with pre-C++11 callers
-	typedef char16_t i18n_uchar;  */
+   typedef char16_t i18n_uchar;  */
+
 #elif U_SIZEOF_WCHAR_T == 2
 typedef wchar_t i18n_uchar;
 #elif defined(__CHAR16_TYPE__)
@@ -213,7 +228,7 @@ typedef __CHAR16_TYPE__ i18n_uchar;
 #else
 typedef uint16_t i18n_uchar;
 #endif
-
+#endif // END OF (U_ICU_VERSION_MAJOR_NUM >= 59)
 
 /**
  * @brief i18n_uchar32.