summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-07-23 19:32:03 +0000
committerDan Albert <danalbert@google.com>2014-07-29 15:15:02 -0700
commit142f1f3ac6032e21b069934c61a9bfa3c08c6e81 (patch)
tree728ac8b6c92270b802a302be731a3f2f68f098ff
parent3aba5bed905af018db8eb9c92ba7685b4aa2b3ec (diff)
downloadexternal_libcxx-142f1f3ac6032e21b069934c61a9bfa3c08c6e81.tar.gz
external_libcxx-142f1f3ac6032e21b069934c61a9bfa3c08c6e81.tar.bz2
external_libcxx-142f1f3ac6032e21b069934c61a9bfa3c08c6e81.zip
Fix ctype_base::xdigit for Android.
Android's ctype implementation comes from openbsd, which for some reason doesn't consider numbers to be hex digits. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@213785 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit d1ab521199792d5b811d4aa779fc04042e95eb3a)
-rw-r--r--include/__locale5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/__locale b/include/__locale
index 3daa1f1b6..c5c078756 100644
--- a/include/__locale
+++ b/include/__locale
@@ -366,7 +366,12 @@ public:
static const mask alpha = _CTYPE_A;
static const mask digit = _CTYPE_D;
static const mask punct = _CTYPE_P;
+# if defined(__ANDROID__)
+ static const mask xdigit = _CTYPE_X | _CTYPE_D;
+# else
static const mask xdigit = _CTYPE_X;
+# endif
+
# if defined(__NetBSD__)
static const mask blank = _CTYPE_BL;
# else