From dde5421950283b4653b1d5256d347dc92c66cdff Mon Sep 17 00:00:00 2001
From: Tristan Gingold
Date: Fri, 14 Nov 2014 21:46:31 +0100
Subject: linux.c: fix typos, disable builting sjlj for clang.

---
 src/grt/config/linux.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/grt/config/linux.c b/src/grt/config/linux.c
index e468056..dd2a9d8 100644
--- a/src/grt/config/linux.c
+++ b/src/grt/config/linux.c
@@ -342,7 +342,7 @@ grt_stack_allocate (void)
    * USE_SETJMP: setjmp/longjmp, slower because signals mask is saved/restored.
 */
 
-#ifdef __GNUC__
+#if defined (__GNUC__) && !defined(__clang__)
 #define USE_BUILTIN_SJLJ
 #else
 #define USE__SETJMP
@@ -350,7 +350,7 @@ grt_stack_allocate (void)
 /* #define USE_SETJMP */
 
 #ifdef USE_BUILTIN_SJLJ
-typedef int *JMP_BUF[5];
+typedef void *JMP_BUF[5];
 static int sjlj_val;
 # define SETJMP(BUF) (__builtin_setjmp (BUF), sjlj_val)
 # define LONGJMP(BUF, VAL) \
@@ -361,7 +361,7 @@ typedef jmp_buf JMP_BUF;
 # ifdef USE__SETJMP
 #  define SETJMP _setjmp
 #  define LONGJMP _longjmp
-# elsif defined (USE_SETJMP)
+# elif defined (USE_SETJMP)
 #  define SETJMP setjmp
 #  define LONGJMP longjmp
 # else
-- 
cgit