From: Willy Tarreau <w@1wt.eu>
Date: Sat, 20 Oct 2018 15:45:48 +0000 (+0200)
Subject: BUILD: compiler: rename __unreachable() to my_unreachable()
X-Git-Tag: v1.9-dev4~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e7cc3381b27e3971b02b73a113ecc13916e1f20;p=thirdparty%2Fhaproxy.git

BUILD: compiler: rename __unreachable() to my_unreachable()

Olivier reported that on FreeBSD __unreachable is already defined
and causes build warnings. Let's rename it then.
---

diff --git a/include/common/compiler.h b/include/common/compiler.h
index 8ebbf05ae9..2f3dd80bb1 100644
--- a/include/common/compiler.h
+++ b/include/common/compiler.h
@@ -89,9 +89,9 @@
  * below was introduced in gcc 4.5, and before it we didn't care.
  */
 #if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define __unreachable() __builtin_unreachable()
+#define my_unreachable() __builtin_unreachable()
 #else
-#define __unreachable()
+#define my_unreachable()
 #endif
 
 /*
diff --git a/src/hlua.c b/src/hlua.c
index 451d6863af..44fb04a798 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -68,7 +68,7 @@
  *   MAY_LJMP() marks an lua function that may use longjmp.
  */
 #define __LJMP
-#define WILL_LJMP(func) do { func; __unreachable(); } while(0)
+#define WILL_LJMP(func) do { func; my_unreachable(); } while(0)
 #define MAY_LJMP(func) func
 
 /* This couple of function executes securely some Lua calls outside of