Merge branch 'plus'

1 files changed, 13 insertions, 3 deletions

diff --git a/include/xtables.h.in b/include/xtables.h.in
index d86276e7..a399f90f 100644
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -37,6 +37,12 @@ struct in_addr;
 /* Include file for additions: new matches and targets. */
 struct xtables_match
 {
+	/*
+	 * ABI/API version this module requires. Must be first member,
+	 * as the rest of this struct may be subject to ABI changes.
+	 */
+	const char *version;
+
 	struct xtables_match *next;
 
 	const char *name;
@@ -46,8 +52,6 @@ struct xtables_match
 
 	u_int16_t family;
 
-	const char *version;
-
 	/* Size of match data. */
 	size_t size;
 
@@ -93,8 +97,15 @@ struct xtables_match
 
 struct xtables_target
 {
+	/*
+	 * ABI/API version this module requires. Must be first member,
+	 * as the rest of this struct may be subject to ABI changes.
+	 */
+	const char *version;
+
 	struct xtables_target *next;
 
+
 	const char *name;
 
 	/* Revision of target (0 by default). */
@@ -102,7 +113,6 @@ struct xtables_target
 
 	u_int16_t family;
 
-	const char *version;
 
 	/* Size of target data. */
 	size_t size;