diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2021-02-22 08:00:00 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2021-02-22 08:00:00 +0000 |
| commit | 78d25ae967a07d43e925404008f57220befbef33 (patch) | |
| tree | dd12969b3a82606cb425c27f10c226fa66aeb643 /tests/nfnetlink_queue.c | |
| parent | 719780b74a4755c95826ca807b718890fd973ee1 (diff) | |
| download | strace-78d25ae967a07d43e925404008f57220befbef33.tar.gz | |
netlink: switch to use bundled <linux/netfilter/nfnetlink_queue.h>
* bundled/linux/include/uapi/linux/netfilter/nfnetlink_queue.h:
New file, copied from headers_install'ed Linux kernel v5.11.
* bundled/Makefile.am (EXTRA_DIST): Add it.
* configure.ac (AC_CHECK_HEADERS): Remove
linux/netfilter/nfnetlink_queue.h.
* src/netlink.c: Include <linux/netfilter/nfnetlink_queue.h>.
* src/xlat/nf_queue_msg_types.in: Add #unconditional, remove fallback
definitions.
* tests/nfnetlink_queue.c [!HAVE_LINUX_NETFILTER_NFNETLINK_QUEUE_H]:
Remove.
Diffstat (limited to 'tests/nfnetlink_queue.c')
| -rw-r--r-- | tests/nfnetlink_queue.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/tests/nfnetlink_queue.c b/tests/nfnetlink_queue.c index 8783d03e9..eddb026d3 100644 --- a/tests/nfnetlink_queue.c +++ b/tests/nfnetlink_queue.c @@ -7,14 +7,11 @@ */ #include "tests.h" - -#ifdef HAVE_LINUX_NETFILTER_NFNETLINK_QUEUE_H - -# include <stdio.h> -# include <sys/socket.h> -# include "netlink.h" -# include <linux/netfilter/nfnetlink.h> -# include <linux/netfilter/nfnetlink_queue.h> +#include <stdio.h> +#include <sys/socket.h> +#include "netlink.h" +#include <linux/netfilter/nfnetlink.h> +#include <linux/netfilter/nfnetlink_queue.h> static void test_nlmsg_type(const int fd) @@ -55,9 +52,3 @@ main(void) return 0; } - -#else - -SKIP_MAIN_UNDEFINED("HAVE_LINUX_NETFILTER_NFNETLINK_QUEUE_H") - -#endif |