mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-09 16:47:18 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: initcall: Rename __GLOBL and __GLOBL1.

Browse Source 
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.
This commit is contained in:
Olivier Houchard 2021-10-09 01:53:03 +02:00
parent 4c67bd6a06
commit e972c0acde
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/haproxy/initcall.h
View File

@ -96,11 +96,11 @@ struct initcall {
* as a pointer (args are cast to (void*)). Do not use this macro directly, * as a pointer (args are cast to (void*)). Do not use this macro directly,
* use INITCALL{0..3}() instead. * use INITCALL{0..3}() instead.
*/ */
#define __GLOBL1(sym) __asm__(".globl " #sym) #define __HA_GLOBL1(sym) __asm__(".globl " #sym)
#define __GLOBL(sym) __GLOBL1(sym) #define __HA_GLOBL(sym) __HA_GLOBL1(sym)
#define __DECLARE_INITCALL(stg, linenum, function, a1, a2, a3) \ #define __DECLARE_INITCALL(stg, linenum, function, a1, a2, a3) \
__GLOBL(__start_i_##stg ); \ __HA_GLOBL(__start_i_##stg ); \
__GLOBL(__stop_i_##stg ); \ __HA_GLOBL(__stop_i_##stg ); \
static const struct initcall *__initcb_##linenum \ static const struct initcall *__initcb_##linenum \
__attribute__((__used__)) HA_INIT_SECTION(stg) = \ __attribute__((__used__)) HA_INIT_SECTION(stg) = \
(stg < STG_SIZE) ? &(const struct initcall) { \ (stg < STG_SIZE) ? &(const struct initcall) { \