From: Olivier Houchard Date: Fri, 8 Oct 2021 23:53:03 +0000 (+0200) Subject: MINOR: initcall: Rename __GLOBL and __GLOBL1. X-Git-Tag: v2.5-dev10~75 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e972c0acde990de30a00f76f7f61470d3325c757;p=thirdparty%2Fhaproxy.git MINOR: initcall: Rename __GLOBL and __GLOBL1. Rename __GLOBL and __GLOBL1 to __HA_GLOBL and __HA_GLOBL1, as the former are already defined on FreeBSD. This should be backported to 2.4, 2.3 and 2.2. --- diff --git a/include/haproxy/initcall.h b/include/haproxy/initcall.h index 56871306d3..50dedb7c89 100644 --- a/include/haproxy/initcall.h +++ b/include/haproxy/initcall.h @@ -96,11 +96,11 @@ struct initcall { * as a pointer (args are cast to (void*)). Do not use this macro directly, * use INITCALL{0..3}() instead. */ -#define __GLOBL1(sym) __asm__(".globl " #sym) -#define __GLOBL(sym) __GLOBL1(sym) +#define __HA_GLOBL1(sym) __asm__(".globl " #sym) +#define __HA_GLOBL(sym) __HA_GLOBL1(sym) #define __DECLARE_INITCALL(stg, linenum, function, a1, a2, a3) \ - __GLOBL(__start_i_##stg ); \ - __GLOBL(__stop_i_##stg ); \ + __HA_GLOBL(__start_i_##stg ); \ + __HA_GLOBL(__stop_i_##stg ); \ static const struct initcall *__initcb_##linenum \ __attribute__((__used__)) HA_INIT_SECTION(stg) = \ (stg < STG_SIZE) ? &(const struct initcall) { \