From 5acd30ca44c3a54a127a1bf94ea546c281ad7c72 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 27 Oct 2023 14:33:13 +0200 Subject: [PATCH] all: use NM_MIN_CONST()/NM_MAX_CONST() instead of MIN()/MAX() glib's MIN()/MAX() will be replaced by NM_MIN()/NM_MAX(). There are however a few places where NM_MIN()/NM_MAX() cannot be used. Adjust those places to use NM_MIN_CONST()/NM_MAX_CONST() instead. --- src/libnm-core-impl/nm-team-utils.h | 3 ++- src/libnm-glib-aux/nm-dedup-multi.h | 2 +- src/libnm-platform/nm-linux-platform.c | 2 +- src/libnm-platform/nmp-plobj.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libnm-core-impl/nm-team-utils.h b/src/libnm-core-impl/nm-team-utils.h index 06fa6cc8b8..722fa18825 100644 --- a/src/libnm-core-impl/nm-team-utils.h +++ b/src/libnm-core-impl/nm-team-utils.h @@ -48,7 +48,8 @@ typedef enum { NM_TEAM_ATTRIBUTE_PORT_LACP_KEY, _NM_TEAM_ATTRIBUTE_PORT_NUM, - _NM_TEAM_ATTRIBUTE_NUM = MAX(_NM_TEAM_ATTRIBUTE_MASTER_NUM, _NM_TEAM_ATTRIBUTE_PORT_NUM), + _NM_TEAM_ATTRIBUTE_NUM = + NM_MAX_CONST(_NM_TEAM_ATTRIBUTE_MASTER_NUM, _NM_TEAM_ATTRIBUTE_PORT_NUM), } NMTeamAttribute; diff --git a/src/libnm-glib-aux/nm-dedup-multi.h b/src/libnm-glib-aux/nm-dedup-multi.h index 87a2b81583..ebc5d0a167 100644 --- a/src/libnm-glib-aux/nm-dedup-multi.h +++ b/src/libnm-glib-aux/nm-dedup-multi.h @@ -37,7 +37,7 @@ typedef enum _NMDedupMultiIdxMode { /*****************************************************************************/ -#define _NMDedupMultiObj_Align (MAX(_nm_alignof(void *), _nm_alignof(gint64))) +#define _NMDedupMultiObj_Align (NM_MAX_CONST(_nm_alignof(void *), _nm_alignof(gint64))) struct _NMDedupMultiObj { union { diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c index 0880e91977..b71989155e 100644 --- a/src/libnm-platform/nm-linux-platform.c +++ b/src/libnm-platform/nm-linux-platform.c @@ -163,7 +163,7 @@ typedef enum _nm_packed { G_STATIC_ASSERT(RTA_MAX == (__RTA_MAX - 1)); #define RTA_PREF 20 #undef RTA_MAX -#define RTA_MAX (MAX((__RTA_MAX - 1), RTA_PREF)) +#define RTA_MAX (NM_MAX_CONST((__RTA_MAX - 1), RTA_PREF)) #ifndef MACVLAN_FLAG_NOPROMISC #define MACVLAN_FLAG_NOPROMISC 1 diff --git a/src/libnm-platform/nmp-plobj.h b/src/libnm-platform/nmp-plobj.h index 35c81509c1..ad18573f8e 100644 --- a/src/libnm-platform/nmp-plobj.h +++ b/src/libnm-platform/nmp-plobj.h @@ -17,7 +17,7 @@ * also "packed" is specified. That's what we want. * https://gcc.gnu.org/onlinedocs/gcc/Common-Type-Attributes.html#Common-Type-Attributes. */ -#define _NMPlatformObject_Align (MAX(_nm_alignof(void *), _nm_alignof(gint64))) +#define _NMPlatformObject_Align (NM_MAX_CONST(_nm_alignof(void *), _nm_alignof(gint64))) struct _NMPlatformObject { /* the object type has no fields of its own, it is only used to having