diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-01-24 15:12:50 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-01-24 15:12:50 +0000 |
| commit | 1ea742bd254586cfeac66a0bcbb90611f86d13b3 (patch) | |
| tree | f30916775adfd7903f141d3bdcf5290b04389d1e | |
| parent | 4a04d0b4aa33e98ea9e7b3e787f0490585ce9b6f (diff) | |
On Darwin, use the system's <unwind.h> whenever it is
available. Clang's <unwind.h> isn't ready for prime time. Fixes
<rdar://problem/10733587>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148807 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Headers/unwind.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h index cef20cc214..28ad8043f2 100644 --- a/lib/Headers/unwind.h +++ b/lib/Headers/unwind.h @@ -23,10 +23,9 @@ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/ -#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \ - __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1070 -/* Starting in OS X Lion the SDK includes a unwind.h. We should just use it. */ -#include_next <unwind.h> +#if defined(__APPLE__) && __has_include_next(<unwind.h>) +/* Darwin typically has its own unwind.h; use it. */ +# include_next <unwind.h> #else #include <stdint.h> |