diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-08-25 13:36:33 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2023-08-25 14:59:19 +0200 |
| commit | d563c93815feb6c92fb4247f2d4f2b1626cf126d (patch) | |
| tree | d9df5839bf890ccacac5cbc7b7cb9652aafd54dd /include | |
| parent | 6a90f33a6fe4b29da52177d87249570af864645d (diff) | |
include: include <std{bool,int}.h> via <nft.h>
There is a minimum base that all our sources will end up needing. This
is what <nft.h> provides.
Add <stdbool.h> and <stdint.h> there. It's unlikely that we want to
implement anything, without having "bool" and "uint32_t" types
available.
Yes, this means the internal headers are not self-contained, with
respect to what <nft.h> provides. This is the exception to the rule, and
our internal headers should rely to have <nft.h> included for them.
They should not include <nft.h> themselves, because <nft.h> needs always
be included as first. So when an internal header would include <nft.h>
it would be unnecessary, because the header is *always* included
already.
Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/datatype.h | 1 | ||||
| -rw-r--r-- | include/dccpopt.h | 1 | ||||
| -rw-r--r-- | include/expression.h | 1 | ||||
| -rw-r--r-- | include/nft.h | 3 | ||||
| -rw-r--r-- | include/nftables.h | 1 | ||||
| -rw-r--r-- | include/rule.h | 1 | ||||
| -rw-r--r-- | include/utils.h | 2 |
7 files changed, 3 insertions, 7 deletions
diff --git a/include/datatype.h b/include/datatype.h index be5c6d1b..9ce7359c 100644 --- a/include/datatype.h +++ b/include/datatype.h @@ -1,7 +1,6 @@ #ifndef NFTABLES_DATATYPE_H #define NFTABLES_DATATYPE_H -#include <stdbool.h> #include <json.h> /** diff --git a/include/dccpopt.h b/include/dccpopt.h index 9686932d..3617fc1a 100644 --- a/include/dccpopt.h +++ b/include/dccpopt.h @@ -2,7 +2,6 @@ #define NFTABLES_DCCPOPT_H #include <nftables.h> -#include <stdint.h> #define DCCPOPT_TYPE_MIN 0 #define DCCPOPT_TYPE_MAX UINT8_MAX diff --git a/include/expression.h b/include/expression.h index 1f58a68c..733dd3cf 100644 --- a/include/expression.h +++ b/include/expression.h @@ -1,7 +1,6 @@ #ifndef NFTABLES_EXPRESSION_H #define NFTABLES_EXPRESSION_H -#include <stdbool.h> #include <gmputil.h> #include <linux/netfilter/nf_tables.h> diff --git a/include/nft.h b/include/nft.h index 0fd481c6..967eb7bc 100644 --- a/include/nft.h +++ b/include/nft.h @@ -4,4 +4,7 @@ #include <config.h> +#include <stdbool.h> +#include <stdint.h> + #endif /* NFTABLES_NFT_H */ diff --git a/include/nftables.h b/include/nftables.h index f073fa95..219a1010 100644 --- a/include/nftables.h +++ b/include/nftables.h @@ -1,7 +1,6 @@ #ifndef NFTABLES_NFTABLES_H #define NFTABLES_NFTABLES_H -#include <stdbool.h> #include <stdarg.h> #include <limits.h> #include <utils.h> diff --git a/include/rule.h b/include/rule.h index 13ab1bf3..8e876d0a 100644 --- a/include/rule.h +++ b/include/rule.h @@ -1,7 +1,6 @@ #ifndef NFTABLES_RULE_H #define NFTABLES_RULE_H -#include <stdint.h> #include <nftables.h> #include <list.h> #include <netinet/in.h> diff --git a/include/utils.h b/include/utils.h index 6764f921..cee1e5c1 100644 --- a/include/utils.h +++ b/include/utils.h @@ -2,8 +2,6 @@ #define NFTABLES_UTILS_H #include <asm/byteorder.h> -#include <stdint.h> -#include <stdbool.h> #include <stdarg.h> #include <stdio.h> #include <unistd.h> |