From: MyoungJune Park Date: Thu, 11 May 2017 01:52:35 +0000 (+0900) Subject: add macro for alerternatives to ICU_TIMEZONE_FILES_DIR X-Git-Tag: accepted/tizen/4.0/unified/20170816.013532^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bbd38b61e0ca40a605468a89f12bf8164c76ff8;p=platform%2Fupstream%2Ficu.git add macro for alerternatives to ICU_TIMEZONE_FILES_DIR /opt/share/icu_tzdata is used to store tzdata res for ICU rather than ICU_TIMEZONE_FILES_DIR. Change-Id: I84ee4f67da234b34a4ee808a1161f0ff0120d3c7 Signed-off-by: MyoungJune Park --- diff --git a/source/common/putil.cpp b/source/common/putil.cpp index 7d0f800..f85a8f7 100644 --- a/source/common/putil.cpp +++ b/source/common/putil.cpp @@ -1336,7 +1336,12 @@ static void U_CALLCONV TimeZoneDataDirInitFn(UErrorCode &status) { status = U_MEMORY_ALLOCATION_ERROR; return; } - const char *dir = getenv("ICU_TIMEZONE_FILES_DIR"); +#ifdef _TIZEN_FEATURE_ + const char *dir = "/opt/share/icu_tzdata"; +#else + const char *dir = getenv("ICU_TIMEZONE_FILES_DIR"); +#endif + #if defined(U_TIMEZONE_FILES_DIR) if (dir == NULL) { dir = TO_STRING(U_TIMEZONE_FILES_DIR);