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