From 06887461548bebcb7aa47f5cb06d421d8fd40944 Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@collabora.co.uk>
Date: Wed, 2 May 2012 13:31:48 +0200
Subject: Add Android to conditionals around langinfo.h usage.

Despite being mandated by POSIX, Android does not support this.

Change-Id: I3da42ff9b3336cb6657692a9eb70dd3118ac1756
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/codecs/qtextcodec.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index b7939f1f3e..916aefab26 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -82,8 +82,9 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <locale.h>
-#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
-#include <langinfo.h>
+#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX) && \
+    !defined(Q_OS_OSF) && !defined(Q_OS_LINUX_ANDROID)
+# include <langinfo.h>
 #endif
 
 #ifdef Q_OS_WIN
@@ -534,7 +535,8 @@ static void setupLocaleMapper()
     localeMapper = QTextCodec::codecForName("System");
 #endif
 
-#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
+#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX) && \
+    !defined(Q_OS_OSF) && !defined(Q_OS_LINUX_ANDROID)
     if (!localeMapper) {
         char *charset = nl_langinfo (CODESET);
         if (charset)
-- 
cgit v1.2.3