diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-01-16 16:25:08 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-01-16 16:25:08 -0800 |
| commit | 1cb0ec225dd97470208cc9e3b59cf35d8f4e3a0b (patch) | |
| tree | 4cd531366cc90a7521d363e5561c25e9e5328b20 /system/include/libcxx/__locale | |
| parent | cf5947187de4390ad0440940f323470b37befbc8 (diff) | |
restore libcxx to pristine state, undoing all our hacks, and work towards fixing test_exceptions given that
Diffstat (limited to 'system/include/libcxx/__locale')
| -rw-r--r-- | system/include/libcxx/__locale | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/system/include/libcxx/__locale b/system/include/libcxx/__locale index b1c0dd7c..f63815c3 100644 --- a/system/include/libcxx/__locale +++ b/system/include/libcxx/__locale @@ -8,8 +8,6 @@ // //===----------------------------------------------------------------------===// -//class locale; // XXX Emscripten - #ifndef _LIBCPP___LOCALE #define _LIBCPP___LOCALE @@ -24,7 +22,7 @@ #if _WIN32 # include <support/win32/locale.h> #else // _WIN32 -/* XXX EMSCRIPTEN # include <xlocale.h> */ +# include <xlocale.h> #endif // _WIN32 #pragma GCC system_header @@ -44,7 +42,6 @@ public: class id; typedef int category; - /* XXX Emscripten static const category // values assigned here are for exposition only none = 0, collate = LC_COLLATE_MASK, @@ -54,7 +51,6 @@ public: time = LC_TIME_MASK, messages = LC_MESSAGES_MASK, all = collate | ctype | monetary | numeric | time | messages; - */ // construct/copy/destroy: locale() _NOEXCEPT; @@ -335,9 +331,9 @@ public: static const mask xdigit = _HEX; static const mask blank = _BLANK; #else // __GLIBC__ || _WIN32 -#if __APPLE__ +#if defined(__APPLE__) || defined(EMSCRIPTEN) typedef __uint32_t mask; -#elif defined(__FreeBSD__) or defined(EMSCRIPTEN) +#elif __FreeBSD__ typedef unsigned long mask; #endif static const mask space = _CTYPE_S; |