>From da742a042e14016f6453eec6d9b3e293157c73dd Mon Sep 17 00:00:00 2001
From: Peter Bex <address@hidden>
Date: Sun, 6 Oct 2013 17:01:27 +0200
Subject: [PATCH] Disable paranoid code for clang & C++, due to limited support
 in g++/clang

---
 chicken.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chicken.h b/chicken.h
index 07e4fe8..88bceb8 100644
--- a/chicken.h
+++ b/chicken.h
@@ -862,7 +862,8 @@ DECL_C_PROC_p0 (128,  1,0,0,0,0,0,0,0)
 # define C_UWORD_MAX               UINT_MAX
 #endif
 
-#if DEBUGBUILD && HAVE_STATEMENT_EXPRESSIONS
+/* Clang and G++ support statement expressions, but only in a limited way */
+#if DEBUGBUILD && HAVE_STATEMENT_EXPRESSIONS && !defined(__clang__) && !defined(__cplusplus)
 /* These are wrappers around the following idiom:
  *    assert(SOME_PRED(obj));
  *    do_something_with(obj);
-- 
1.8.3.4