kozorizki/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUILD: solaris: fix compilation errors

Browse Source 
Compilation on solaris fails because of usage of names reserved on that
platform, i.e. 'queue' and 's_addr'.

This patch redefines 'queue' as '_queue' and renames 's_addr' to
'srv_addr' which fixes compilation for now.

Future plan: rename 'queue' in code base so define can be removed again.

Backporting: 2.9, 2.8
This commit is contained in:
matthias sweertvaegher 2024-02-23 17:05:01 +01:00 committed by Willy Tarreau
parent 88e141b823
commit 062ea3a3d4
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/haproxy/compat.h
View File

@ -303,6 +303,12 @@ typedef struct { } empty_t;
#define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST
#endif
/* On Solaris, `queue` is a reserved name, so we redefine it here for now.
*/
#if defined(sun)
#define queue _queue
#endif
#endif /* _HAPROXY_COMPAT_H */
/*

18
src/server.c
View File

@ -4467,11 +4467,11 @@ int snr_resolution_cb(struct resolv_requester *requester, struct dns_counters *c
update_status:
if (has_no_ip && !snr_set_srv_down(s)) {
struct server_inetaddr s_addr;
struct server_inetaddr srv_addr;
memset(&s_addr, 0, sizeof(s_addr));
memset(&srv_addr, 0, sizeof(srv_addr));
/* unset server's addr */
server_set_inetaddr(s, &s_addr, SERVER_INETADDR_UPDATER_NONE, NULL);
server_set_inetaddr(s, &srv_addr, SERVER_INETADDR_UPDATER_NONE, NULL);
}
return 1;
@ -4481,11 +4481,11 @@ int snr_resolution_cb(struct resolv_requester *requester, struct dns_counters *c
goto update_status;
}
if (has_no_ip && !snr_set_srv_down(s)) {
struct server_inetaddr s_addr;
struct server_inetaddr srv_addr;
memset(&s_addr, 0, sizeof(s_addr));
memset(&srv_addr, 0, sizeof(srv_addr));
/* unset server's addr */
server_set_inetaddr(s, &s_addr, SERVER_INETADDR_UPDATER_NONE, NULL);
server_set_inetaddr(s, &srv_addr, SERVER_INETADDR_UPDATER_NONE, NULL);
}
return 0;
}
@ -4567,11 +4567,11 @@ int snr_resolution_error_cb(struct resolv_requester *requester, int error_code)
HA_SPIN_LOCK(SERVER_LOCK, &s->lock);
if (!snr_set_srv_down(s)) {
struct server_inetaddr s_addr;
struct server_inetaddr srv_addr;
memset(&s_addr, 0, sizeof(s_addr));
memset(&srv_addr, 0, sizeof(srv_addr));
/* unset server's addr */
server_set_inetaddr(s, &s_addr, SERVER_INETADDR_UPDATER_NONE, NULL);
server_set_inetaddr(s, &srv_addr, SERVER_INETADDR_UPDATER_NONE, NULL);
HA_SPIN_UNLOCK(SERVER_LOCK, &s->lock);
resolv_detach_from_resolution_answer_items(requester->resolution, requester);
return 0;