summaryrefslogtreecommitdiffstats
path: root/libcxx/src
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2016-09-19 18:00:45 +0000
committerDan Albert <danalbert@google.com>2016-09-19 18:00:45 +0000
commitc991709f460218e493eef36e8792865dac0a6461 (patch)
treef0a7fb2bfcd2a15c93e64f2135086b132c4b6729 /libcxx/src
parentcc83c66ee9e5137d43039cbed3cc2f56fe407adc (diff)
downloadbcm5719-llvm-c991709f460218e493eef36e8792865dac0a6461.tar.gz
bcm5719-llvm-c991709f460218e493eef36e8792865dac0a6461.zip
Replace __ANDROID__ with __BIONIC__.
Summary: None of these checks are specific to Android devices. If libc++ was used with Bionic on a normal Linux system these checks would still be needed. Reviewers: mclow.lists, EricWF Subscribers: compnerd, tberghammer, danalbert, srhines, cfe-commits Differential Revision: https://reviews.llvm.org/D24690 llvm-svn: 281921
Diffstat (limited to 'libcxx/src')
-rw-r--r--libcxx/src/locale.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp
index a4e0a53d638..12f05413c60 100644
--- a/libcxx/src/locale.cpp
+++ b/libcxx/src/locale.cpp
@@ -28,7 +28,7 @@
#include "__sso_allocator"
#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
#include "support/win32/locale_win32.h"
-#elif !defined(__ANDROID__)
+#elif !defined(__BIONIC__)
#include <langinfo.h>
#endif
#include <stdlib.h>
OpenPOWER on IntegriCloud