LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix classic_table implementation for bionic

Browse Source 
Change-Id: I26716b16bddcfb7109f436822067950fd99a5c08
This commit is contained in:
Dan Albert
2014-04-17 17:42:46 -07:00
parent c13109d445
commit 2517f4fe31
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/__locale
View File

@@ -343,13 +343,15 @@ public:
static const mask punct = _PUNCT; static const mask punct = _PUNCT;
static const mask xdigit = _HEX; static const mask xdigit = _HEX;
static const mask blank = _BLANK; static const mask blank = _BLANK;
#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__) #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__) || defined(__ANDROID__)
#ifdef __APPLE__ #ifdef __APPLE__
typedef __uint32_t mask; typedef __uint32_t mask;
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
typedef unsigned long mask; typedef unsigned long mask;
#elif defined(__EMSCRIPTEN__) || defined(__NetBSD__) #elif defined(__EMSCRIPTEN__) || defined(__NetBSD__)
typedef unsigned short mask; typedef unsigned short mask;
#elif defined(__ANDROID__)
typedef char mask;
#endif #endif
static const mask space = _CTYPE_S; static const mask space = _CTYPE_S;
static const mask print = _CTYPE_R; static const mask print = _CTYPE_R;

2
src/locale.cpp
View File

@@ -1039,6 +1039,8 @@ ctype<char>::classic_table() _NOEXCEPT
return *__ctype_b_loc(); return *__ctype_b_loc();
#elif defined(_AIX) #elif defined(_AIX)
return (const unsigned int *)__lc_ctype_ptr->obj->mask; return (const unsigned int *)__lc_ctype_ptr->obj->mask;
#elif defined(__ANDROID__)
return _ctype_;
#else #else
// Platform not supported: abort so the person doing the port knows what to // Platform not supported: abort so the person doing the port knows what to
// fix // fix