From 4082a18406c18af7b4fcef7bd501c3679c3be56b Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Wed, 22 Nov 2017 23:08:06 +0100 Subject: android: use unified headers and llvm-c++ STL (x86) with NDK 16 gnustl (and others) are to be removed in future versions of the ndk also bump gradle and build-tools to current versions along with it arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix that later Change-Id: Ic794c3293b599b77ec48096bf3283a99c09cbb79 Reviewed-on: https://gerrit.libreoffice.org/45163 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier --- i18nutil/source/utility/paper.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'i18nutil') diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx index b052ad54de2c..0d4b434c061c 100644 --- a/i18nutil/source/utility/paper.cxx +++ b/i18nutil/source/utility/paper.cxx @@ -290,7 +290,8 @@ PaperInfo PaperInfo::getSystemDefaultPaper() } #endif -#if defined(LC_PAPER) && defined(_GNU_SOURCE) +// _NL_PAPER_WIDTH / HEIGHT not available with android unified headers +#if defined(LC_PAPER) && defined(_GNU_SOURCE) && !defined(ANDROID) // try LC_PAPER locale_t loc = newlocale(LC_PAPER_MASK, "", static_cast(0)); if (loc != static_cast(0)) -- cgit