upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-15 21:59:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

Browse source 
Olivier reported that on FreeBSD __unreachable is already defined
and causes build warnings. Let's rename it then.
This commit is contained in:
Willy Tarreau 2018-10-20 17:45:48 +02:00
parent 7a6ad88b02
commit 4e7cc3381b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/common/compiler.h
View file

@ -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
/*

2
src/hlua.c
View file

@ -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