Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-07-14 22:01:10 +01:00
7 changed files with 18 additions and 8 deletions

2
tmux.h
View File

@@ -1503,7 +1503,7 @@ struct tmuxproc *proc_start(const char *);
void proc_loop(struct tmuxproc *, int (*)(void));
void proc_exit(struct tmuxproc *);
void proc_set_signals(struct tmuxproc *, void(*)(int));
void proc_clear_signals(struct tmuxproc *);
void proc_clear_signals(struct tmuxproc *, int);
struct tmuxpeer *proc_add_peer(struct tmuxproc *, int,
void (*)(struct imsg *, void *), void *);
void proc_remove_peer(struct tmuxpeer *);