Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-06-14 12:01:10 +01:00
5 changed files with 18 additions and 2 deletions

2
tmux.h
View File

@ -429,6 +429,7 @@ enum msgtype {
MSG_IDENTIFY_STDIN,
MSG_IDENTIFY_ENVIRON,
MSG_IDENTIFY_DONE,
MSG_IDENTIFY_CLIENTPID,
MSG_COMMAND = 200,
MSG_DETACH,
@ -1210,6 +1211,7 @@ RB_HEAD(status_out_tree, status_out);
struct client {
struct imsgbuf ibuf;
pid_t pid;
int fd;
struct event event;
int retval;