diff options
| author | Michael Forney <mforney@mforney.org> | 2019-10-04 18:34:31 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2019-10-04 18:34:31 -0700 |
| commit | 9b268df2f79e112b98dce51fe9359dbce126711e (patch) | |
| tree | 32baf8d3b28217829ead260202ee3182b72fe318 /pkg/libnl/patch/0004-Avoid-statement-expression-in-ATTR_DIFF-macro.patch | |
| parent | e6df1e7263e94204d4445eb684c3df13e9fc8a1a (diff) | |
libnl: Update to 3.5.0
Diffstat (limited to 'pkg/libnl/patch/0004-Avoid-statement-expression-in-ATTR_DIFF-macro.patch')
| -rw-r--r-- | pkg/libnl/patch/0004-Avoid-statement-expression-in-ATTR_DIFF-macro.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/pkg/libnl/patch/0004-Avoid-statement-expression-in-ATTR_DIFF-macro.patch b/pkg/libnl/patch/0004-Avoid-statement-expression-in-ATTR_DIFF-macro.patch new file mode 100644 index 00000000..135c6ff5 --- /dev/null +++ b/pkg/libnl/patch/0004-Avoid-statement-expression-in-ATTR_DIFF-macro.patch @@ -0,0 +1,28 @@ +From e56f5df0379c7dc70f6ce61a31167185daa51cae Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Sun, 11 Aug 2019 21:57:03 +0000 +Subject: [PATCH] Avoid statement expression in ATTR_DIFF macro + +--- + include/netlink-private/object-api.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/include/netlink-private/object-api.h b/include/netlink-private/object-api.h +index 517e672..269cd4b 100644 +--- a/include/netlink-private/object-api.h ++++ b/include/netlink-private/object-api.h +@@ -260,10 +260,7 @@ struct nl_object + * @endcode + */ + #define ATTR_DIFF(LIST, ATTR, A, B, EXPR) \ +-({ uint64_t diff = 0; \ +- if (((LIST) & (ATTR)) && ATTR_MISMATCH(A, B, ATTR, EXPR)) \ +- diff = ATTR; \ +- diff; }) ++ ((uint64_t)(((LIST) & (ATTR)) && ATTR_MISMATCH(A, B, ATTR, EXPR) ? (ATTR) : 0)) + + /** + * Object Operations +-- +2.23.0 + |