| commit | 30a63f92cb2b0f8528e65ad2459738cddacae7a1 | [log] [tgz] |
|---|---|---|
| author | Fredrik Roubert <roubert@google.com> | Tue Mar 03 17:43:35 2015 +0100 |
| committer | Fredrik Roubert <roubert@google.com> | Thu Mar 19 18:00:10 2015 +0100 |
| tree | dcf7c028e4c867bd5f4c8a768317fa13719950b5 | |
| parent | 4e677801627de87b0fe176477b051c45396a12d9 [diff] |
Android patch: Ticket #11578: #define U_USE_USRDATA 0 This is a temporary workaround until the issue has been fixed upstream: http://bugs.icu-project.org/trac/ticket/11578 This change was introduced in Android by these patches: https://android.googlesource.com/platform/external/icu/+/72bf11c https://android.googlesource.com/platform/external/icu/+/e3816ae Change-Id: Ib0319a6e7e0913873d015d7de2ce2846afcde53a
diff --git a/icu4c/source/common/unicode/utypes.h b/icu4c/source/common/unicode/utypes.h index 09037a8..c5a53dd 100644 --- a/icu4c/source/common/unicode/utypes.h +++ b/icu4c/source/common/unicode/utypes.h
@@ -137,7 +137,11 @@ #define U_ICUDATA_NAME "icudt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER #ifndef U_HIDE_INTERNAL_API #define U_USRDATA_NAME "usrdt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER /**< @internal */ -#define U_USE_USRDATA 1 /**< @internal */ +/* BEGIN android-change - U_USE_USRDATA should be off by default. */ +#ifndef U_USE_USRDATA +#define U_USE_USRDATA 0 /**< @internal */ +#endif /* U_USE_USRDATA */ +/* END android-change */ #endif /* U_HIDE_INTERNAL_API */ /**