commit e45cf3e8b5b03c41c5d025ad443debdcc54ab58d
author Marshall Clow <mclow.lists@gmail.com> Thu Jul 10 15:20:28 2014 +0000
committer Dan Albert <danalbert@google.com> Thu Jul 10 16:52:03 2014 -0700
tree 50e892a72f4a8a8503ccb68374676f09a34266d7
parent 3bfb9441d653a9f8d3986193a7697a7c5b1411e5

Add support for BIONIC C library (Android). Patch from Dan Albert

Change-Id: I9ead4d8a1d16e71d57fdc7696457cfcc3de4f713
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@212724 91177308-0d34-0410-b5e6-96231b3b80d8

src/locale.cpp

diff --git a/src/locale.cpp b/src/locale.cpp
index 868c758..fc314ca 100644
--- a/src/locale.cpp
+++ b/src/locale.cpp
@@ -30,11 +30,9 @@
 #include "__sso_allocator"
 #if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
 #include <support/win32/locale_win32.h>
-#elif defined(__ANDROID__)
-#include <support/android/langinfo.h>
-#else // _LIBCPP_MSVCRT
+#elif !defined(__ANDROID__)
 #include <langinfo.h>
-#endif // !_LIBCPP_MSVCRT
+#endif
 #include <stdlib.h>
 #include <stdio.h>