diff options
| author | Michael Biebl <biebl@debian.org> | 2019-03-31 10:11:55 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-03-31 10:11:55 +0200 |
| commit | 4b96345400eafd4bfc70fd77ef19e026d690aca0 (patch) | |
| tree | fed6aa242532689235f5333132ff98b82961765f /shared/nm-utils/nm-macros-internal.h | |
| parent | 8ea1145a9e031c8021590abf780dd7c149e231cf (diff) | |
| parent | f66fcea265a5869667d832386e9337237a44afef (diff) | |
Merge branch 'master' into stretch-backports
Diffstat (limited to 'shared/nm-utils/nm-macros-internal.h')
| -rw-r--r-- | shared/nm-utils/nm-macros-internal.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h index 084219b4..9059783f 100644 --- a/shared/nm-utils/nm-macros-internal.h +++ b/shared/nm-utils/nm-macros-internal.h @@ -639,6 +639,9 @@ NM_G_ERROR_MSG (GError *error) #define NM_PROPAGATE_CONST(test_expr, ptr) (ptr) #endif +#define NM_MAKE_STRV(...) \ + ((const char *const[]) { __VA_ARGS__, NULL }) + /*****************************************************************************/ #define _NM_IN_SET_EVAL_1( op, _x, y) (_x == (y)) @@ -1321,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 |