]> granicus.if.org Git - icu/commitdiff
ICU-10478 Android does not have nl_langinfo(codeset)
authorMarkus Scherer <markus.icu@gmail.com>
Fri, 28 Feb 2014 19:27:37 +0000 (19:27 +0000)
committerMarkus Scherer <markus.icu@gmail.com>
Fri, 28 Feb 2014 19:27:37 +0000 (19:27 +0000)
X-SVN-Rev: 35260

icu4c/source/common/putilimp.h

index afbd62297256f743b145566aaa771275a7d8ae0f..beaf6474b1bbf77a69abfb16b06fc05a8da72368 100644 (file)
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 1997-2013, International Business Machines
+*   Copyright (C) 1997-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
@@ -85,7 +85,7 @@ typedef size_t uintptr_t;
 
 #ifdef U_HAVE_NL_LANGINFO_CODESET
     /* Use the predefined value. */
-#elif U_PLATFORM_HAS_WIN32_API
+#elif U_PLATFORM_HAS_WIN32_API || U_PLATFORM == U_PF_ANDROID
 #   define U_HAVE_NL_LANGINFO_CODESET 0
 #else
 #   define U_HAVE_NL_LANGINFO_CODESET 1