From d1f959589a804ff01288ae2cc610d6679415d772 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 18 Mar 2009 07:17:10 +0100
Subject: Fix use of reserved names in header sandwich

Signed-off-by: Patrick McHardy <kaber@trash.net>
---
 include/ct.h         | 6 +++---
 include/datatype.h   | 6 +++---
 include/erec.h       | 6 +++---
 include/expression.h | 6 +++---
 include/exthdr.h     | 6 +++---
 include/gmputil.h    | 6 +++---
 include/headers.h    | 6 +++---
 include/meta.h       | 6 +++---
 include/netlink.h    | 6 +++---
 include/nftables.h   | 6 +++---
 include/parser.h     | 6 +++---
 include/payload.h    | 6 +++---
 include/rbtree.h     | 6 +++---
 include/rule.h       | 6 +++---
 include/statement.h  | 6 +++---
 include/utils.h      | 6 +++---
 16 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/include/ct.h b/include/ct.h
index 946bc297..67718c84 100644
--- a/include/ct.h
+++ b/include/ct.h
@@ -1,5 +1,5 @@
-#ifndef _CT_H
-#define _CT_H
+#ifndef NFTABLES_CT_H
+#define NFTABLES_CT_H
 
 /**
  * struct ct_template
@@ -26,4 +26,4 @@ struct ct_template {
 extern struct expr *ct_expr_alloc(const struct location *loc,
 				  enum nft_ct_keys key);
 
-#endif /* _CT_H */
+#endif /* NFTABLES_CT_H */
diff --git a/include/datatype.h b/include/datatype.h
index c6aeeeda..c3415223 100644
--- a/include/datatype.h
+++ b/include/datatype.h
@@ -1,5 +1,5 @@
-#ifndef _DATATYPE_H
-#define _DATATYPE_H
+#ifndef NFTABLES_DATATYPE_H
+#define NFTABLES_DATATYPE_H
 
 /**
  * enum datatypes
@@ -153,4 +153,4 @@ extern const struct datatype inet_service_type;
 extern const struct datatype mark_type;
 extern const struct datatype time_type;
 
-#endif /* _DATATYPE_H */
+#endif /* NFTABLES_DATATYPE_H */
diff --git a/include/erec.h b/include/erec.h
index 51f39588..25df1d0f 100644
--- a/include/erec.h
+++ b/include/erec.h
@@ -1,5 +1,5 @@
-#ifndef _EREC_H
-#define _EREC_H
+#ifndef NFTABLES_EREC_H
+#define NFTABLES_EREC_H
 
 #include <nftables.h>
 #include <utils.h>
@@ -61,4 +61,4 @@ static inline void erec_queue(struct error_record *erec,
 extern void erec_print(FILE *f, const struct error_record *erec);
 extern void erec_print_list(FILE *f, struct list_head *list);
 
-#endif /* _EREC_H */
+#endif /* NFTABLES_EREC_H */
diff --git a/include/expression.h b/include/expression.h
index 72585469..e9d21cfc 100644
--- a/include/expression.h
+++ b/include/expression.h
@@ -1,5 +1,5 @@
-#ifndef _EXPRESSION_H
-#define _EXPRESSION_H
+#ifndef NFTABLES_EXPRESSION_H
+#define NFTABLES_EXPRESSION_H
 
 #include <stdbool.h>
 #include <gmp.h>
@@ -320,4 +320,4 @@ extern struct expr *mapping_expr_alloc(const struct location *loc,
 extern struct expr *map_expr_alloc(const struct location *loc,
 				   struct expr *arg, struct expr *list);
 
-#endif /* _EXPRESSION_H */
+#endif /* NFTABLES_EXPRESSION_H */
diff --git a/include/exthdr.h b/include/exthdr.h
index 8ef0b395..62e69bd2 100644
--- a/include/exthdr.h
+++ b/include/exthdr.h
@@ -1,5 +1,5 @@
-#ifndef _EXTHDR_H
-#define _EXTHDR_H
+#ifndef NFTABLES_EXTHDR_H
+#define NFTABLES_EXTHDR_H
 
 /**
  * struct exthdr_desc - extension header description
@@ -81,4 +81,4 @@ extern const struct exthdr_desc exthdr_frag;
 extern const struct exthdr_desc exthdr_dst;
 extern const struct exthdr_desc exthdr_mh;
 
-#endif /* _EXTHDR_H */
+#endif /* NFTABLES_EXTHDR_H */
diff --git a/include/gmputil.h b/include/gmputil.h
index 41a6c270..88be697a 100644
--- a/include/gmputil.h
+++ b/include/gmputil.h
@@ -1,5 +1,5 @@
-#ifndef _GMPUTIL_H
-#define _GMPUTIL_H
+#ifndef NFTABLES_GMPUTIL_H
+#define NFTABLES_GMPUTIL_H
 
 #include <gmp.h>
 
@@ -39,4 +39,4 @@ extern void mpz_import_data(mpz_t rop, const void *data,
 			    unsigned int len);
 extern void mpz_switch_byteorder(mpz_t rop, unsigned int len);
 
-#endif /* _GMPUTIL_H */
+#endif /* NFTABLES_GMPUTIL_H */
diff --git a/include/headers.h b/include/headers.h
index be20cec0..5bbfdc49 100644
--- a/include/headers.h
+++ b/include/headers.h
@@ -1,5 +1,5 @@
-#ifndef _HEADERS_H
-#define _HEADERS_H
+#ifndef NFTABLES_HEADERS_H
+#define NFTABLES_HEADERS_H
 
 #ifndef IPPROTO_UDPLITE
 # define IPPROTO_UDPLITE	136
@@ -116,4 +116,4 @@ struct ip6_mh {
 /* RFC 5142 */
 #define IP6_MH_TYPE_HASM	12	/* Home Agent Switch Message	*/
 
-#endif /* _HEADERS_H */
+#endif /* NFTABLES_HEADERS_H */
diff --git a/include/meta.h b/include/meta.h
index 75b1f1eb..459221fb 100644
--- a/include/meta.h
+++ b/include/meta.h
@@ -1,5 +1,5 @@
-#ifndef _META_H
-#define _META_H
+#ifndef NFTABLES_META_H
+#define NFTABLES_META_H
 
 /**
  * struct meta_template - template for meta expressions and statements
@@ -26,4 +26,4 @@ struct meta_template {
 extern struct expr *meta_expr_alloc(const struct location *loc,
 				    enum nft_meta_keys key);
 
-#endif /* _META_H */
+#endif /* NFTABLES_META_H */
diff --git a/include/netlink.h b/include/netlink.h
index 4849ff51..cec5247b 100644
--- a/include/netlink.h
+++ b/include/netlink.h
@@ -1,5 +1,5 @@
-#ifndef _NETLINK_H
-#define _NETLINK_H
+#ifndef NFTABLES_NETLINK_H
+#define NFTABLES_NETLINK_H
 
 #include <netlink/netfilter/netfilter.h>
 #include <netlink/netfilter/nft_table.h>
@@ -57,4 +57,4 @@ extern int netlink_get_table(struct netlink_ctx *ctx, const struct handle *h);
 extern int netlink_list_table(struct netlink_ctx *ctx, const struct handle *h);
 extern int netlink_flush_table(struct netlink_ctx *ctx, const struct handle *h);
 
-#endif /* _NETLINK_H */
+#endif /* NFTABLES_NETLINK_H */
diff --git a/include/nftables.h b/include/nftables.h
index 7e4a2fc8..d0a3d544 100644
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -1,5 +1,5 @@
-#ifndef _NFTABLES_H
-#define _NFTABLES_H
+#ifndef NFTABLES_NFTABLES_H
+#define NFTABLES_NFTABLES_H
 
 #include <stdbool.h>
 #include <stdarg.h>
@@ -93,4 +93,4 @@ struct input_descriptor {
 	off_t				line_offset;
 };
 
-#endif /* _NFTABLES_H */
+#endif /* NFTABLES_NFTABLES_H */
diff --git a/include/parser.h b/include/parser.h
index 2a4c73b4..a47bd0f0 100644
--- a/include/parser.h
+++ b/include/parser.h
@@ -1,5 +1,5 @@
-#ifndef _PARSER_H
-#define _PARSER_H
+#ifndef NFTABLES_PARSER_H
+#define NFTABLES_PARSER_H
 
 #include <list.h>
 
@@ -33,4 +33,4 @@ extern void scanner_push_buffer(void *scanner,
 				const struct input_descriptor *indesc,
 				const char *buffer);
 
-#endif /* _PARSER_H */
+#endif /* NFTABLES_PARSER_H */
diff --git a/include/payload.h b/include/payload.h
index ff9b1381..3a7150bd 100644
--- a/include/payload.h
+++ b/include/payload.h
@@ -1,5 +1,5 @@
-#ifndef _PAYLOAD_H
-#define _PAYLOAD_H
+#ifndef NFTABLES_PAYLOAD_H
+#define NFTABLES_PAYLOAD_H
 
 #include <nftables.h>
 
@@ -286,4 +286,4 @@ extern const struct payload_desc payload_arp;
 extern const struct payload_desc payload_vlan;
 extern const struct payload_desc payload_eth;
 
-#endif /* _PAYLOAD_H */
+#endif /* NFTABLES_PAYLOAD_H */
diff --git a/include/rbtree.h b/include/rbtree.h
index 26b6b44a..ac65283f 100644
--- a/include/rbtree.h
+++ b/include/rbtree.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef	_RBTREE_H
-#define	_RBTREE_H
+#ifndef	NFTABLES_RBTREE_H
+#define	NFTABLES_RBTREE_H
 
 #include <stddef.h>
 
@@ -95,4 +95,4 @@ static inline void rb_link_node(struct rb_node * node, struct rb_node * parent,
 	     (pos) != NULL; \
 	     (node) = (next))
 
-#endif	/* _RBTREE_H */
+#endif	/* NFTABLES_RBTREE_H */
diff --git a/include/rule.h b/include/rule.h
index e4ad9f58..991d1125 100644
--- a/include/rule.h
+++ b/include/rule.h
@@ -1,5 +1,5 @@
-#ifndef _RULE_H
-#define _RULE_H
+#ifndef NFTABLES_RULE_H
+#define NFTABLES_RULE_H
 
 #include <stdint.h>
 #include <nftables.h>
@@ -171,4 +171,4 @@ extern struct error_record *rule_postprocess(struct rule *rule);
 struct netlink_ctx;
 extern int do_command(struct netlink_ctx *ctx, struct cmd *cmd);
 
-#endif /* RULE_H */
+#endif /* NFTABLES_RULE_H */
diff --git a/include/statement.h b/include/statement.h
index 6e5cfbdb..20b6f9a9 100644
--- a/include/statement.h
+++ b/include/statement.h
@@ -1,5 +1,5 @@
-#ifndef _STATEMENT_H
-#define _STATEMENT_H
+#ifndef NFTABLES_STATEMENT_H
+#define NFTABLES_STATEMENT_H
 
 #include <list.h>
 #include <expression.h>
@@ -137,4 +137,4 @@ extern void stmt_free(struct stmt *stmt);
 extern void stmt_list_free(struct list_head *list);
 extern void stmt_print(const struct stmt *stmt);
 
-#endif /* _STATEMENT_H */
+#endif /* NFTABLES_STATEMENT_H */
diff --git a/include/utils.h b/include/utils.h
index beb63868..15271e5b 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -1,5 +1,5 @@
-#ifndef _UTILS_H
-#define _UTILS_H
+#ifndef NFTABLES_UTILS_H
+#define NFTABLES_UTILS_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -66,4 +66,4 @@ extern void *xrealloc(void *ptr, size_t size);
 extern void *xzalloc(size_t size);
 extern char *xstrdup(const char *s);
 
-#endif /* _UTILS_H */
+#endif /* NFTABLES_UTILS_H */
-- 
cgit v1.2.3