diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-05-11 15:37:17 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-05-11 16:18:51 +0300 |
| commit | 95a8ac4f5ad2c5d59f03725b7e101d0d2a8654f0 (patch) | |
| tree | 820190647311e7e6b99f48bd59c5d441dcf8f8c2 /icu/icu4c-android.patch | |
| parent | a973651de8b119f76e93459c26c0363664a8ed4e (diff) | |
The timezone variable is called just that on Android
Change-Id: Icd3f13bec24227174b3698ed26f97d8c55d892ff
Diffstat (limited to 'icu/icu4c-android.patch')
| -rw-r--r-- | icu/icu4c-android.patch | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/icu/icu4c-android.patch b/icu/icu4c-android.patch index f8163d3052c3..1056ea49adca 100644 --- a/icu/icu4c-android.patch +++ b/icu/icu4c-android.patch @@ -84,3 +84,12 @@ #else # define U_HAVE_NL_LANGINFO_CODESET 1 #endif +@@ -114,6 +114,8 @@ + + #ifdef U_TIMEZONE + /* Use the predefined value. */ ++#elif defined(__ANDROID__) ++# define U_TIMEZONE timezone + #elif U_PLATFORM_IS_LINUX_BASED + # define U_TIMEZONE __timezone + #elif U_PLATFORM_USES_ONLY_WIN32_API |