diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-29 13:03:33 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-29 16:38:44 +0000 |
| commit | 2fd7d71ae530e6bd64a44b74a470a03ea81f78d0 (patch) | |
| tree | f98fe2f424daf3399baebc6de2925db2c33023dd /main/icu/icu-timezone.patch | |
| parent | ef56c18fb98f9e31de7856e52aa2b73bc05d7b2a (diff) | |
| download | aports-2fd7d71ae530e6bd64a44b74a470a03ea81f78d0.tar.bz2 aports-2fd7d71ae530e6bd64a44b74a470a03ea81f78d0.tar.xz | |
main/icu: upgrade to 54.1
Diffstat (limited to 'main/icu/icu-timezone.patch')
| -rw-r--r-- | main/icu/icu-timezone.patch | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/main/icu/icu-timezone.patch b/main/icu/icu-timezone.patch index 19ee8ca0fe..c1d05c2548 100644 --- a/main/icu/icu-timezone.patch +++ b/main/icu/icu-timezone.patch @@ -1,16 +1,11 @@ ---- source/common/putilimp.h -+++ source/common/putilimp.h -@@ -115,11 +115,8 @@ - /* Use the predefined value. */ - #elif U_PLATFORM == U_PF_ANDROID - # define U_TIMEZONE timezone --#elif U_PLATFORM_IS_LINUX_BASED --# if !defined(__UCLIBC__) -- /* __timezone is only available in glibc */ --# define U_TIMEZONE __timezone --# endif -+#elif U_PLATFORM_IS_LINUX_BASED && defined(__GLIBC__) && !defined(__UCLIBC__) -+# define U_TIMEZONE __timezone +--- ./common/putilimp.h.orig ++++ ./common/putilimp.h +@@ -123,6 +123,8 @@ + # elif defined(__GLIBC__) + /* glibc */ + # define U_TIMEZONE __timezone ++# else ++# define U_TIMEZONE timezone + # endif #elif U_PLATFORM_USES_ONLY_WIN32_API # define U_TIMEZONE _timezone - #elif U_PLATFORM == U_PF_BSD && !defined(__NetBSD__) |