From 78ecbe3c5d6fd584352e3bdb554db34715f435cf Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Thu, 9 Jan 2020 11:16:07 +0100 Subject: [PATCH] n-dhcp4: use C_CLAMP() macro instead of c_clamp() The latter requires __auto_type which is not available in GCC versions older than 4.9. Fix the following compile error on RHEL 7.8: CC src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo shared/n-dhcp4/src/n-dhcp4-c-probe.c: In function 'n_dhcp4_client_probe_transition_nak': shared/n-dhcp4/src/n-dhcp4-c-probe.c:1008:17: error: unknown type name '__auto_type' probe->ns_nak_restart_delay = c_clamp(probe->ns_nak_restart_delay * 2, ^ shared/n-dhcp4/src/n-dhcp4-c-probe.c:1008:17: error: unknown type name '__auto_type' shared/n-dhcp4/src/n-dhcp4-c-probe.c:1008:17: error: unknown type name '__auto_type' Fixes: 218782a9a3c3 ('n-dhcp4: restart the transaction after a NAK') (cherry picked from commit 3a9b069c4161dbfc652e1b6b5447790165da6d87) --- shared/n-dhcp4/src/n-dhcp4-c-probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c index 82a089ee5f..5bed15b8f4 100644 --- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c +++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c @@ -1005,7 +1005,7 @@ static int n_dhcp4_client_probe_transition_nak(NDhcp4ClientProbe *probe) { probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT; probe->ns_deferred = n_dhcp4_gettime(CLOCK_BOOTTIME) + probe->ns_nak_restart_delay; - probe->ns_nak_restart_delay = c_clamp(probe->ns_nak_restart_delay * 2, + probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2, UINT64_C(1000000000 * 2), UINT64_C(1000000000 * 300)); break;