--- ../patch-o-matic-ng/patchlets/ipv4options/iptables/extensions/libipt_ipv4options.c.orig	2008-03-13 18:56:14.000000000 +0100
+++ ../patch-o-matic-ng/patchlets/ipv4options/iptables/extensions/libipt_ipv4options.c	2008-03-13 20:12:14.000000000 +0100
@@ -25,22 +25,22 @@
 }
 
 static struct option opts[] = {
-	{ "ssrr", 0, 0, '1' },
-	{ "lsrr", 0, 0, '2' },
-	{ "no-srr", 0, 0, '3'},
-	{ "rr", 0, 0, '4'},
-	{ "ts", 0, 0, '5'},
-	{ "ra", 0, 0, '6'},
-	{ "any-opt", 0, 0, '7'},
-	{0}
+	{ .name = "ssrr", .has_arg = 0, .flag = 0, .val = '1' },
+	{ .name = "lsrr", .has_arg = 0, .flag = 0, .val = '2' },
+	{ .name = "no-srr", .has_arg = 0, .flag = 0, .val = '3'},
+	{ .name = "rr", .has_arg = 0, .flag = 0, .val = '4'},
+	{ .name = "ts", .has_arg = 0, .flag = 0, .val = '5'},
+	{ .name = "ra", .has_arg = 0, .flag = 0, .val = '6'},
+	{ .name = "any-opt", .has_arg = 0, .flag = 0, .val = '7'},
+	{ .name = NULL }
 };
 
 /* Function which parses command options; returns true if it
    ate an option */
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
-      const struct ipt_entry *entry,
-      struct ipt_entry_match **match)
+      const void *entry,
+      struct xt_entry_match **match)
 {
 	struct ipt_ipv4options_info *info = (struct ipt_ipv4options_info *)(*match)->data;
 
@@ -225,8 +225,8 @@
 
 /* Prints out the matchinfo. */
 static void
-print(const struct ipt_ip *ip,
-      const struct ipt_entry_match *match,
+print(const void *ip,
+      const struct xt_entry_match *match,
       int numeric)
 {
 	struct ipt_ipv4options_info *info = ((struct ipt_ipv4options_info *)match->data);
@@ -260,7 +260,7 @@
 
 /* Saves the data in parsable form to stdout. */
 static void
-save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+save(const void *ip, const struct xt_entry_match *match)
 {
 	struct ipt_ipv4options_info *info = ((struct ipt_ipv4options_info *)match->data);
 
@@ -290,7 +290,7 @@
 	printf(" ");
 }
 
-static struct iptables_match ipv4options_struct = { 
+static struct xtables_match ipv4options_struct = { 
 	.next		= NULL,
 	.name		= "ipv4options",
 	.version	= IPTABLES_VERSION,