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 /include | |
| 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 'include')
| -rw-r--r-- | include/libipset/linux_ip_set.h | 7 | ||||
| -rw-r--r-- | include/libipset/linux_ip_set_bitmap.h | 8 | ||||
| -rw-r--r-- | include/libipset/linux_ip_set_hash.h | 8 | ||||
| -rw-r--r-- | include/libipset/linux_ip_set_list.h | 8 |
4 files changed, 19 insertions, 12 deletions
diff --git a/include/libipset/linux_ip_set.h b/include/libipset/linux_ip_set.h index def91b9..883922d 100644 --- a/include/libipset/linux_ip_set.h +++ b/include/libipset/linux_ip_set.h @@ -7,8 +7,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifndef _UAPI_IP_SET_H -#define _UAPI_IP_SET_H +#ifndef _IP_SET_H +#define _IP_SET_H #include <linux/types.h> @@ -118,6 +118,7 @@ enum { IPSET_ATTR_SKBMARK, IPSET_ATTR_SKBPRIO, IPSET_ATTR_SKBQUEUE, + IPSET_ATTR_PAD, __IPSET_ATTR_ADT_MAX, }; #define IPSET_ATTR_ADT_MAX (__IPSET_ATTR_ADT_MAX - 1) @@ -300,4 +301,4 @@ struct ip_set_req_version { unsigned int version; }; -#endif /* _UAPI_IP_SET_H */ +#endif /* _IP_SET_H */ diff --git a/include/libipset/linux_ip_set_bitmap.h b/include/libipset/linux_ip_set_bitmap.h index 6a2c038..c4b63d6 100644 --- a/include/libipset/linux_ip_set_bitmap.h +++ b/include/libipset/linux_ip_set_bitmap.h @@ -1,5 +1,7 @@ -#ifndef _UAPI__IP_SET_BITMAP_H -#define _UAPI__IP_SET_BITMAP_H +#ifndef __IP_SET_BITMAP_H +#define __IP_SET_BITMAP_H + + /* Bitmap type specific error codes */ enum { @@ -10,4 +12,4 @@ enum { }; -#endif /* _UAPI__IP_SET_BITMAP_H */ +#endif /* __IP_SET_BITMAP_H */ diff --git a/include/libipset/linux_ip_set_hash.h b/include/libipset/linux_ip_set_hash.h index 352eecc..73d40d7 100644 --- a/include/libipset/linux_ip_set_hash.h +++ b/include/libipset/linux_ip_set_hash.h @@ -1,5 +1,7 @@ -#ifndef _UAPI__IP_SET_HASH_H -#define _UAPI__IP_SET_HASH_H +#ifndef __IP_SET_HASH_H +#define __IP_SET_HASH_H + + /* Hash type specific error codes */ enum { @@ -18,4 +20,4 @@ enum { }; -#endif /* _UAPI__IP_SET_HASH_H */ +#endif /* __IP_SET_HASH_H */ diff --git a/include/libipset/linux_ip_set_list.h b/include/libipset/linux_ip_set_list.h index a44efaa..f8cb89e 100644 --- a/include/libipset/linux_ip_set_list.h +++ b/include/libipset/linux_ip_set_list.h @@ -1,5 +1,7 @@ -#ifndef _UAPI__IP_SET_LIST_H -#define _UAPI__IP_SET_LIST_H +#ifndef __IP_SET_LIST_H +#define __IP_SET_LIST_H + + /* List type specific error codes */ enum { @@ -18,4 +20,4 @@ enum { }; -#endif /* _UAPI__IP_SET_LIST_H */ +#endif /* __IP_SET_LIST_H */ |