path: root/include/
diff options
authorJan Engelhardt <>2010-11-15 14:39:35 +0100
committerJan Engelhardt <>2010-11-15 14:39:35 +0100
commit710a132ce9fbecedbf9447f2b2a134f2359a583c (patch)
tree4e4590c9449f9f3c272f1a8d18216b64f7d99b66 /include/
parente84f131b5f992577119bd3679241f69ec394e0a7 (diff)
Revert "Revert "libxtables: change option precedence order to be intuitive""
This reverts commit e84f131b5f992577119bd3679241f69ec394e0a7. Solution follows.
Diffstat (limited to 'include/')
1 files changed, 3 insertions, 2 deletions
diff --git a/include/ b/include/
index 9e47c2d2..c3d34af5 100644
--- a/include/
+++ b/include/
@@ -219,8 +219,9 @@ extern int xtables_insmod(const char *, const char *, bool);
extern int xtables_load_ko(const char *, bool);
extern int xtables_set_params(struct xtables_globals *xtp);
extern void xtables_free_opts(int reset_offset);
-extern struct option *xtables_merge_options(struct option *oldopts,
- const struct option *newopts, unsigned int *option_offset);
+extern struct option *xtables_merge_options(struct option *origopts,
+ struct option *oldopts, const struct option *newopts,
+ unsigned int *option_offset);
extern int xtables_init_all(struct xtables_globals *xtp, uint8_t nfproto);
extern struct xtables_match *xtables_find_match(const char *name,