[cfe-commits] r148807 - /cfe/trunk/lib/Headers/unwind.h

Douglas Gregor dgregor at apple.com
Tue Jan 24 07:12:50 PST 2012


Author: dgregor
Date: Tue Jan 24 09:12:50 2012
New Revision: 148807

URL: http://llvm.org/viewvc/llvm-project?rev=148807&view=rev
Log:
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>.

Modified:
    cfe/trunk/lib/Headers/unwind.h

Modified: cfe/trunk/lib/Headers/unwind.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/unwind.h?rev=148807&r1=148806&r2=148807&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/unwind.h (original)
+++ cfe/trunk/lib/Headers/unwind.h Tue Jan 24 09:12:50 2012
@@ -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>





More information about the cfe-commits mailing list