From 7c07c59aa39d66fdc67a40189945cbc22687e174 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 3 Dec 2018 11:09:32 +0100
Subject: [PATCH] shared: add NM_MAX_WITH_CMP() macro

(cherry picked from commit e0191d420162fa78561ab1f45749ef2cd6464626)
---
 shared/nm-utils/nm-macros-internal.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h
index 764144e9f5..9059783faa 100644
--- a/shared/nm-utils/nm-macros-internal.h
+++ b/shared/nm-utils/nm-macros-internal.h
@@ -1324,6 +1324,16 @@ nm_strcmp_p (gconstpointer a, gconstpointer b)
 		     : NM_UNIQ_T(X,xq)); \
 	})
 
+#define NM_MAX_WITH_CMP(cmp, a, b) \
+	({ \
+		typeof (a) _a = (a); \
+		typeof (b) _b = (b); \
+		\
+		(  ((cmp (_a, _b)) >= 0) \
+		 ? _a \
+		 : _b); \
+	})
+
 /*****************************************************************************/
 
 static inline guint