From 710a132ce9fbecedbf9447f2b2a134f2359a583c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 15 Nov 2010 14:39:35 +0100 Subject: Revert "Revert "libxtables: change option precedence order to be intuitive"" This reverts commit e84f131b5f992577119bd3679241f69ec394e0a7. Solution follows. --- include/xtables.h.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/xtables.h.in') diff --git a/include/xtables.h.in b/include/xtables.h.in index 9e47c2d2..c3d34af5 100644 --- a/include/xtables.h.in +++ b/include/xtables.h.in @@ -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, -- cgit v1.2.3