diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2017-09-14 19:48:03 +0200 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2017-09-14 19:48:03 +0200 |
commit | 7aa278e4c474adfac06ddb35584b31534366628f (patch) | |
tree | d55e26a339c4b1c1faa752ab6e657ad69e05e077 /Makefile.am | |
parent | 4fc1ac6a4016c1e09cc393dfedb7eb4e9678efd3 (diff) |
Fix the include guards on the include/libipset/linux_ip_set*.h
The include guards did not prevent including the "same" userspace
and kernel header files.
Fixes bugzilla id #1139, reported and solution suggested by Quentin Armitage.
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index e3404fa..8d718e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,8 +88,10 @@ endif update_includes: for x in ip_set.h ip_set_bitmap.h ip_set_hash.h ip_set_list.h; do \ - cp kernel/include/uapi/linux/netfilter/ipset/$$x \ - include/libipset/linux_$$x; \ + sed -r -e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \ + -e 's@^#include <linux/netfilter/ipset/ip_set.h>@@' \ + kernel/include/uapi/linux/netfilter/ipset/$$x \ + > include/libipset/linux_$$x; \ done update_utils: |