From e5f6f3a3d80a0c79860ebf4638183c8edc3dfe33 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 6 Sep 2013 12:19:24 +0700 Subject: Use __EMSCRIPTEN__ rather than EMSCRIPTEN. This was requested by someone upstream when I'd originally submitted these changes and is more correct. --- system/lib/libcxx/exception.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'system/lib/libcxx/exception.cpp') 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) -- cgit v1.2.3-18-g5258