[PATCH] Improve the unwind.h inclusion

[Sylvestre Ledru]

Without this patch, the first local include of unwind.h might, with the __has_include_next, try to include the one from the system.
It might be /usr/include/clang/3.4/include/unwind.h
Because of the #ifndef __CLANG_UNWIND_H, it might never include any declaration from the system. 

This patch is applied in http://llvm.org/apt/ It enables the build of clang with the Debian packages installed on the system.


http://llvm-reviews.chandlerc.com/D2150

Files:
  lib/Headers/unwind.h

Index: lib/Headers/unwind.h
===================================================================
--- lib/Headers/unwind.h
+++ lib/Headers/unwind.h
@@ -23,9 +23,6 @@
 
 /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
 
-#ifndef __CLANG_UNWIND_H
-#define __CLANG_UNWIND_H
-
 #if __has_include_next(<unwind.h>)
 /* Darwin (from 11.x on) and libunwind provide an unwind.h. If that's available,
  * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE,
@@ -53,6 +50,9 @@
 # endif
 #else
 
+#ifndef __CLANG_UNWIND_H
+#define __CLANG_UNWIND_H
+
 #include <stdint.h>
 
 #ifdef __cplusplus
@@ -275,6 +275,7 @@
 }
 #endif
 
+#endif /* __CLANG_UNWIND_H */
+
 #endif
 
-#endif /* __CLANG_UNWIND_H */
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D2150.1.patch
Type: text/x-patch
Size: 725 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20131112/2f85b4a5/attachment.bin>