diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-11-25 11:41:30 +0400 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-11-25 11:41:30 +0400 |
| commit | c245a8a0c8bbb3c40ec2dd7f517a12802427c3c5 (patch) | |
| tree | 00bd15af4ad7e3c988f8840c48c41e2cf9f9e902 /libcxx/include/locale | |
| parent | 7c0578e35702809edb8285e189ca91cff3220bcf (diff) | |
Merging r195136:
------------------------------------------------------------------------
r195136 | marshall | 2013-11-19 10:05:03 -0800 (Tue, 19 Nov 2013) | 1 line
Patch by Bruce Mitchener. Change all references to EMSCRIPTEN to __EMSCRIPTEN__. If you're not using the PP symbol EMSCRIPTEN, then you should see no functionality change.
------------------------------------------------------------------------
llvm-svn: 195622
Diffstat (limited to 'libcxx/include/locale')
| -rw-r--r-- | libcxx/include/locale | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/locale b/libcxx/include/locale index d13d49e64668..ac3ae7ead92f 100644 --- a/libcxx/include/locale +++ b/libcxx/include/locale @@ -229,7 +229,7 @@ typedef _VSTD::unique_ptr<__locale_struct, decltype(&uselocale)> __locale_raii; // OSX has nice foo_l() functions that let you turn off use of the global // locale. Linux, not so much. The following functions avoid the locale when // that's possible and otherwise do the wrong thing. FIXME. -#if defined(__linux__) || defined(EMSCRIPTEN) || defined(_AIX) +#if defined(__linux__) || defined(__EMSCRIPTEN__) || defined(_AIX) #ifdef _LIBCPP_LOCALE__L_EXTENSIONS decltype(MB_CUR_MAX_L(_VSTD::declval<locale_t>())) |