| OLD | NEW |
| 1 Index: source/common/putilimp.h | 1 Index: source/common/putilimp.h |
| 2 =================================================================== | 2 =================================================================== |
| 3 --- source/common/putilimp.h (revision 259715) | 3 --- source/common/putilimp.h (revision 259715) |
| 4 +++ source/common/putilimp.h (working copy) | 4 +++ source/common/putilimp.h (working copy) |
| 5 @@ -85,7 +85,7 @@ | 5 @@ -85,7 +85,7 @@ |
| 6 | 6 |
| 7 #ifdef U_HAVE_NL_LANGINFO_CODESET | 7 #ifdef U_HAVE_NL_LANGINFO_CODESET |
| 8 /* Use the predefined value. */ | 8 /* Use the predefined value. */ |
| 9 -#elif U_PLATFORM_HAS_WIN32_API | 9 -#elif U_PLATFORM_HAS_WIN32_API |
| 10 +#elif U_PLATFORM_HAS_WIN32_API || U_PLATFORM == U_PF_ANDROID || U_PLATFORM == U
_PF_QNX | 10 +#elif U_PLATFORM_HAS_WIN32_API || U_PLATFORM == U_PF_ANDROID || U_PLATFORM == U
_PF_QNX |
| 11 # define U_HAVE_NL_LANGINFO_CODESET 0 | 11 # define U_HAVE_NL_LANGINFO_CODESET 0 |
| 12 #else | 12 #else |
| 13 # define U_HAVE_NL_LANGINFO_CODESET 1 | 13 # define U_HAVE_NL_LANGINFO_CODESET 1 |
| 14 @@ -116,9 +116,14 @@ |
| 15 #elif U_PLATFORM == U_PF_ANDROID |
| 16 # define U_TIMEZONE timezone |
| 17 #elif U_PLATFORM_IS_LINUX_BASED |
| 18 + /* uClibc does not have __timezone nor _timezone. */ |
| 19 + /* gLibc has __timezone while newlib has _timezone. */ |
| 20 # if !defined(__UCLIBC__) |
| 21 - /* __timezone is only available in glibc */ |
| 22 -# define U_TIMEZONE __timezone |
| 23 +# if defined(__GLIBC__) |
| 24 +# define U_TIMEZONE __timezone |
| 25 +# else |
| 26 +# define U_TIMEZONE _timezone |
| 27 +# endif |
| 28 # endif |
| 29 #elif U_PLATFORM_USES_ONLY_WIN32_API |
| 30 # define U_TIMEZONE _timezone |
| OLD | NEW |