From 82f5db2e26789b1da1c546367cfec02dd3224478 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Mon, 9 Nov 2015 20:00:06 +0100
Subject: [PATCH] More libunwind compilation fixes

---
 headers/libs/libunwind/libunwind-x86.h    | 6 +++++-
 headers/libs/libunwind/libunwind-x86_64.h | 6 +++++-
 src/libs/libunwind/x86/Ginit.c            | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/headers/libs/libunwind/libunwind-x86.h b/headers/libs/libunwind/libunwind-x86.h
index 40fe0464f2..728973be40 100644
--- a/headers/libs/libunwind/libunwind-x86.h
+++ b/headers/libs/libunwind/libunwind-x86.h
@@ -32,7 +32,11 @@ extern "C" {
 
 #include <sys/types.h>
 #include <inttypes.h>
-#include <ucontext.h>
+#ifndef __HAIKU__
+# include <ucontext.h>
+#else
+# include <signal.h>
+#endif
 
 #define UNW_TARGET      x86
 #define UNW_TARGET_X86  1
diff --git a/headers/libs/libunwind/libunwind-x86_64.h b/headers/libs/libunwind/libunwind-x86_64.h
index 78eb541afb..907e894dad 100644
--- a/headers/libs/libunwind/libunwind-x86_64.h
+++ b/headers/libs/libunwind/libunwind-x86_64.h
@@ -34,7 +34,11 @@ extern "C" {
 
 #include <sys/types.h>
 #include <inttypes.h>
-#include <ucontext.h>
+#ifndef __HAIKU__
+# include <ucontext.h>
+#else
+# include <signal.h>
+#endif
 
 #define UNW_TARGET              x86_64
 #define UNW_TARGET_X86_64       1
diff --git a/src/libs/libunwind/x86/Ginit.c b/src/libs/libunwind/x86/Ginit.c
index b05a08edba..17cbb0a450 100644
--- a/src/libs/libunwind/x86/Ginit.c
+++ b/src/libs/libunwind/x86/Ginit.c
@@ -25,7 +25,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <stdlib.h>