From ede6e585971ad2fdf0c627aa7e60b44f753debdb Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Fri, 28 Feb 2014 19:27:37 +0000 Subject: [PATCH] ICU-10478 Android does not have nl_langinfo(codeset) X-SVN-Rev: 35260 --- icu4c/source/common/putilimp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icu4c/source/common/putilimp.h b/icu4c/source/common/putilimp.h index afbd6229725..beaf6474b1b 100644 --- a/icu4c/source/common/putilimp.h +++ b/icu4c/source/common/putilimp.h @@ -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 -- 2.40.0