aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-01-24 22:01:13 +0000
committerThomas Adam <thomas@xteddy.org>2017-01-24 22:01:13 +0000
commit418ab1a553f46996d3524bab5c81b2c66fa7efc6 (patch)
treeb29b61f95da6d7732628cdfb6dcf5e23c2fede5e /tmux.h
parentf38a6bbd816533d01d14c8bbafbb51621e5e1326 (diff)
parentffc28a7765f4b560427404c9679966232655e67e (diff)
downloadrtmux-418ab1a553f46996d3524bab5c81b2c66fa7efc6.tar.gz
rtmux-418ab1a553f46996d3524bab5c81b2c66fa7efc6.tar.bz2
rtmux-418ab1a553f46996d3524bab5c81b2c66fa7efc6.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/tmux.h b/tmux.h
index 76a4968e..15fbb726 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1671,7 +1671,7 @@ void printflike(3, 4) environ_set(struct environ *, const char *, const char *,
void environ_clear(struct environ *, const char *);
void environ_put(struct environ *, const char *);
void environ_unset(struct environ *, const char *);
-void environ_update(const char *, struct environ *, struct environ *);
+void environ_update(struct options *, struct environ *, struct environ *);
void environ_push(struct environ *);
void environ_log(struct environ *, const char *);
@@ -1830,6 +1830,7 @@ void printflike(2, 3) cmdq_print(struct cmdq_item *, const char *, ...);
void printflike(2, 3) cmdq_error(struct cmdq_item *, const char *, ...);
/* cmd-string.c */
+int cmd_string_split(const char *, int *, char ***);
struct cmd_list *cmd_string_parse(const char *, const char *, u_int, char **);
/* cmd-wait-for.c */