Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-12-16 18:01:31 +00:00
4 changed files with 87 additions and 71 deletions

13
tmux.h
View File

@ -509,13 +509,10 @@ struct msg_command {
struct msg_read_open {
int stream;
int fd;
char path[PATH_MAX];
};
}; /* followed by path */
struct msg_read_data {
int stream;
size_t size;
char data[BUFSIZ];
};
struct msg_read_done {
@ -526,15 +523,12 @@ struct msg_read_done {
struct msg_write_open {
int stream;
int fd;
char path[PATH_MAX];
int flags;
};
}; /* followed by path */
struct msg_write_data {
int stream;
size_t size;
char data[BUFSIZ];
};
}; /* followed by data */
struct msg_write_ready {
int stream;
@ -2236,7 +2230,6 @@ void server_client_push_stdout(struct client *);
void server_client_push_stderr(struct client *);
void printflike(2, 3) server_client_add_message(struct client *, const char *,
...);
char *server_client_get_path(struct client *, const char *);
const char *server_client_get_cwd(struct client *, struct session *);
/* server-fn.c */