diff options
author | Thomas Adam <thomas@xteddy.org> | 2017-01-16 15:36:02 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2017-01-16 15:36:02 +0000 |
commit | 7e110b9d99cf4ffa05e316c954d5f2f315e3f7cc (patch) | |
tree | 556e0e939b96290f5e2e233044d03c28366c25ae /cmd-set-option.c | |
parent | f20e3ee62c310da3eb091a2773e21442412db4ed (diff) | |
parent | ef15b4195f1453bf6f81cfd1e456c049922aa574 (diff) | |
download | rtmux-7e110b9d99cf4ffa05e316c954d5f2f315e3f7cc.tar.gz rtmux-7e110b9d99cf4ffa05e316c954d5f2f315e3f7cc.tar.bz2 rtmux-7e110b9d99cf4ffa05e316c954d5f2f315e3f7cc.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-set-option.c')
-rw-r--r-- | cmd-set-option.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c index 475b91c2..ef2ce10b 100644 --- a/cmd-set-option.c +++ b/cmd-set-option.c @@ -30,7 +30,7 @@ static enum cmd_retval cmd_set_option_exec(struct cmd *, struct cmdq_item *); static int cmd_set_option_set(struct cmd *, struct cmdq_item *, - struct options *, struct option *, const char *); + struct options *, struct options_entry *, const char *); static int cmd_set_option_flag(struct cmdq_item *, const struct options_table_entry *, struct options *, const char *); @@ -75,7 +75,7 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item) struct client *c; enum options_table_scope scope; struct options *oo; - struct option *parent, *o; + struct options_entry *parent, *o; const char *name, *value, *target; int window, idx, already, error, ambiguous; char *cause; @@ -256,12 +256,12 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item) static int cmd_set_option_set(struct cmd *self, struct cmdq_item *item, struct options *oo, - struct option *parent, const char *value) + struct options_entry *parent, const char *value) { const struct options_table_entry *oe; struct args *args = self->args; int append = args_has(args, 'a'); - struct option *o; + struct options_entry *o; long long number; const char *errstr; key_code key; |