diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-09-06 18:34:38 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-09-06 18:34:38 -0700 |
| commit | 38890204ed1f5f8dd34cced7c42fc9cf42dccab5 (patch) | |
| tree | 0b6d76adc047a0c81c9e0caf0dbbae93c5461948 /system/lib/libcxx/exception.cpp | |
| parent | b5b49215d4a40566380a769f47a9c1cce74a28b0 (diff) | |
| parent | fce749a7066e51d57967889fab0600c285885b4b (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'system/lib/libcxx/exception.cpp')
| -rw-r--r-- | system/lib/libcxx/exception.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/lib/libcxx/exception.cpp b/system/lib/libcxx/exception.cpp index d3e1b292..3487bd8b 100644 --- a/system/lib/libcxx/exception.cpp +++ b/system/lib/libcxx/exception.cpp @@ -78,7 +78,7 @@ get_terminate() _NOEXCEPT return __sync_fetch_and_add(&__terminate_handler, (terminate_handler)0); } -#ifndef EMSCRIPTEN // We provide this in JS +#ifndef __EMSCRIPTEN__ // We provide this in JS _LIBCPP_NORETURN void terminate() _NOEXCEPT @@ -101,10 +101,10 @@ terminate() _NOEXCEPT } #endif // _LIBCPP_NO_EXCEPTIONS } -#endif // !EMSCRIPTEN +#endif // !__EMSCRIPTEN__ #endif // !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION) -#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) && !defined(EMSCRIPTEN) +#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) && !defined(__EMSCRIPTEN__) bool uncaught_exception() _NOEXCEPT { #if defined(__APPLE__) || defined(_LIBCPPABI_VERSION) |