From b0a7cf7f050fb99ead1d745a8c928310e3403bd0 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 24 Nov 2016 14:09:34 +0100 Subject: include: expose a copy of nf_conntrack_common.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Get rid of copy&paster definitions that were made long time ago, this is causing problems. Copy and rename nf_conntrack_common.h to linux_nf_conntrack_common.h, then include it from libnetfilter_conntrack.h After that change, we can remove the status flags definition in libnetfilter_conntrack.h that was copied and pasted from the above file. This helps us solve compilation errors due to redeclaration: /usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:729:6: error: redeclaration of ‘enum ip_conntrack_status’ In file included from nf-log.c:12:0: /usr/include/linux/netfilter/nf_conntrack_common.h:37:6: note: originally defined here Signed-off-by: Pablo Neira Ayuso --- include/libnetfilter_conntrack/Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'include/libnetfilter_conntrack/Makefile.am') diff --git a/include/libnetfilter_conntrack/Makefile.am b/include/libnetfilter_conntrack/Makefile.am index fd36bfb..8c3cf5c 100644 --- a/include/libnetfilter_conntrack/Makefile.am +++ b/include/libnetfilter_conntrack/Makefile.am @@ -1,2 +1,11 @@ -pkginclude_HEADERS = libnetfilter_conntrack.h linux_nfnetlink_conntrack.h libnetfilter_conntrack_tcp.h libnetfilter_conntrack_udp.h libnetfilter_conntrack_icmp.h libnetfilter_conntrack_sctp.h libnetfilter_conntrack_dccp.h libnetfilter_conntrack_ipv4.h libnetfilter_conntrack_ipv6.h +pkginclude_HEADERS = libnetfilter_conntrack.h \ + linux_nfnetlink_conntrack.h \ + linux_nf_conntrack_common.h \ + libnetfilter_conntrack_tcp.h \ + libnetfilter_conntrack_udp.h \ + libnetfilter_conntrack_icmp.h \ + libnetfilter_conntrack_sctp.h \ + libnetfilter_conntrack_dccp.h \ + libnetfilter_conntrack_ipv4.h \ + libnetfilter_conntrack_ipv6.h -- cgit v1.2.3