include: fix possible clash in ifdef namespace

Use _LIBNFTABLES_ prefix to avoid possible clash with headers that
are defined in other libraries that may be used by third party
applications.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/libnftables/chain.h b/include/libnftables/chain.h
index 7dee88a9ab266d79d075eb60018d0e769eef5bd8..fff47d347fcf44ee9c4c5a7faa50d0260cdc5f03 100644 (file)
--- a/include/libnftables/chain.h
+++ b/include/libnftables/chain.h
@@ -1,5 +1,5 @@
-#ifndef _CHAIN_H_
-#define _CHAIN_H_
+#ifndef _LIBNFTABLES_CHAIN_H_
+#define _LIBNFTABLES_CHAIN_H_
 
 #include <stdio.h>
 #include <stdint.h>
@@ -79,4 +79,4 @@ void nft_chain_list_iter_destroy(struct nft_chain_list_iter *iter);
 } /* extern "C" */
 #endif
 
-#endif /* _CHAIN_H_ */
+#endif /* _LIBNFTABLES_CHAIN_H_ */

diff --git a/include/libnftables/common.h b/include/libnftables/common.h
index d19a84ba70df80a61797142399f88091c6afe1ff..2283d725678f79323655f74daa6b5a7715935171 100644 (file)
--- a/include/libnftables/common.h
+++ b/include/libnftables/common.h
@@ -1,5 +1,5 @@
-#ifndef _COMMON_H_
-#define _COMMON_H_
+#ifndef _LIBNFTABLES_COMMON_H_
+#define _LIBNFTABLES_COMMON_H_
 
 enum nft_output_type {
        NFT_OUTPUT_DEFAULT      = 0,

diff --git a/include/libnftables/expr.h b/include/libnftables/expr.h
index 81e224cbbfe1139a388957b7fbc04ddbd3f83b92..54de186b878b95d44889eca599341e4b9332b1f1 100644 (file)
--- a/include/libnftables/expr.h
+++ b/include/libnftables/expr.h
@@ -1,5 +1,5 @@
-#ifndef _RULE_EXPR_H_
-#define _RULE_EXPR_H_
+#ifndef _LIBNFTABLES_RULE_EXPR_H_
+#define _LIBNFTABLES_RULE_EXPR_H_
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -147,4 +147,4 @@ enum {
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* _LIBNFTABLES_RULE_EXPR_H_ */

diff --git a/include/libnftables/rule.h b/include/libnftables/rule.h
index 4957a2a14b4d61f5d571278c76118bd42dec8e3a..d1d75e1260adc27f3bc2f9247b9e5be11856ca3a 100644 (file)
--- a/include/libnftables/rule.h
+++ b/include/libnftables/rule.h
@@ -1,5 +1,5 @@
-#ifndef _RULE_H_
-#define _RULE_H_
+#ifndef _LIBNFTABLES_RULE_H_
+#define _LIBNFTABLES_RULE_H_
 
 #include <stdio.h>
 #include <stdint.h>
@@ -85,4 +85,4 @@ void nft_rule_list_iter_destroy(struct nft_rule_list_iter *iter);
 } /* extern "C" */
 #endif
 
-#endif /* _RULE_H_ */
+#endif /* _LIBNFTABLES_RULE_H_ */

diff --git a/include/libnftables/ruleset.h b/include/libnftables/ruleset.h
index 71ef3b157efca61282f460d1a3be5b05845ff63f..1ec3059f122d2dba18174603d554a376eb2358e3 100644 (file)
--- a/include/libnftables/ruleset.h
+++ b/include/libnftables/ruleset.h
@@ -1,5 +1,5 @@
-#ifndef _RULESET_H_
-#define _RULESET_H_
+#ifndef _LIBNFTABLES_RULESET_H_
+#define _LIBNFTABLES_RULESET_H_
 
 #include <stdio.h>
 
@@ -38,4 +38,4 @@ int nft_ruleset_fprintf(FILE *fp, const struct nft_ruleset *rs, uint32_t type, u
 } /* extern "C" */
 #endif
 
-#endif /* _RULESET_H_ */
+#endif /* _LIBNFTABLES_RULESET_H_ */

diff --git a/include/libnftables/set.h b/include/libnftables/set.h
index d3780496d2ea45e92d7dbd547763c3c35bd2e0c6..d91bd424042ad6d94d67d32f4a9985b847841a39 100644 (file)
--- a/include/libnftables/set.h
+++ b/include/libnftables/set.h
@@ -1,5 +1,5 @@
-#ifndef _NFT_SET_H_
-#define _NFT_SET_H_
+#ifndef _LIBNFTABLES_SET_H_
+#define _LIBNFTABLES_SET_H_
 
 #include <stdio.h>
 #include <stdint.h>
@@ -110,4 +110,4 @@ struct nft_set_elem *nft_set_elems_iter_cur(struct nft_set_elems_iter *iter);
 struct nft_set_elem *nft_set_elems_iter_next(struct nft_set_elems_iter *iter);
 void nft_set_elems_iter_destroy(struct nft_set_elems_iter *iter);
 
-#endif
+#endif /* _LIBNFTABLES_SET_H_ */

diff --git a/include/libnftables/table.h b/include/libnftables/table.h
index 9228cecdca1defbde2eff3fae740ac95e22aa4d8..87481e42a1003419b17ff4fdff185acb5cc884a0 100644 (file)
--- a/include/libnftables/table.h
+++ b/include/libnftables/table.h
@@ -1,5 +1,5 @@
-#ifndef _TABLE_H_
-#define _TABLE_H_
+#ifndef _LIBNFTABLES_TABLE_H_
+#define _LIBNFTABLES_TABLE_H_
 
 #include <stdio.h>
 #include <stdint.h>
@@ -67,4 +67,4 @@ void nft_table_list_iter_destroy(struct nft_table_list_iter *iter);
 } /* extern "C" */
 #endif
 
-#endif /* _TABLE_H_ */
+#endif /* _LIBNFTABLES_TABLE_H_ */