diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 16:01:04 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 16:01:04 -0700 |
| commit | 00c2e03551a61ca76bdb303f1c007845f8a6dbd6 (patch) | |
| tree | 51a3fb38eff156561441960606533fd0c1be71df /system/lib/libcxx/exception.cpp | |
| parent | 36600f34ef0ec2cf75165be3753567e256f514db (diff) | |
| parent | 2787d1f7d01afb598ed56c4d52dab876e0a34a74 (diff) | |
Merge pull request #1009 from waywardmonkeys/another-libcxx-update1.3.6
Another libcxx update
Diffstat (limited to 'system/lib/libcxx/exception.cpp')
| -rw-r--r-- | system/lib/libcxx/exception.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/lib/libcxx/exception.cpp b/system/lib/libcxx/exception.cpp index 8d5ded4d..1d2f6b25 100644 --- a/system/lib/libcxx/exception.cpp +++ b/system/lib/libcxx/exception.cpp @@ -14,7 +14,7 @@ #define __has_include(inc) 0 #endif -#if __APPLE__ +#ifdef __APPLE__ #include <cxxabi.h> using namespace __cxxabiv1; @@ -104,7 +104,7 @@ terminate() _NOEXCEPT #if !defined(LIBCXXRT) && !defined(__GLIBCXX__) && !defined(EMSCRIPTEN) bool uncaught_exception() _NOEXCEPT { -#if __APPLE__ || defined(_LIBCPPABI_VERSION) +#if defined(__APPLE__) || defined(_LIBCPPABI_VERSION) // on Darwin, there is a helper function so __cxa_get_globals is private return __cxa_uncaught_exception(); #else // __APPLE__ |