mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-11-28 14:21:00 +01:00
BUILD: compiler: undefine the CONCAT() macro if already defined
As Ilya reported in issue #2911, the CONCAT() macro breaks on NetBSD which defines its own as __CONCAT() (which is exactly the same). Let's just undefine it before ours to fix the issue instead of renaming, but keep ours so that we don't have doubts about what we're running with. Note that the patch introducing this breaking change was backported to 3.0.
This commit is contained in:
parent
a703eeaef7
commit
4ec5509541
@ -284,6 +284,7 @@
|
||||
#define TOSTR(x) _TOSTR(x)
|
||||
|
||||
/* concatenates the two strings after resolving possible macros */
|
||||
#undef CONCAT // Turns out NetBSD defines it to the same in exec_elf.h
|
||||
#define _CONCAT(a,b) a ## b
|
||||
#define CONCAT(a,b) _CONCAT(a,b)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user