diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-11-14 11:38:30 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-11-14 11:38:30 +0000 |
| commit | 7b749eff3510ccf173c029a92c266e91454ce600 (patch) | |
| tree | 8194d8dcf4d3364360960c741a3266cb9a9d7101 /tmux.h | |
| parent | 23266e8e095fb590543d309ae3c8e30fcd98d6b7 (diff) | |
| parent | c56b81a2ce815f6d289232f20bb6e07cfd0e36ec (diff) | |
| download | rtmux-7b749eff3510ccf173c029a92c266e91454ce600.tar.gz rtmux-7b749eff3510ccf173c029a92c266e91454ce600.tar.bz2 rtmux-7b749eff3510ccf173c029a92c266e91454ce600.zip | |
Merge branch 'obsd-master'
Conflicts:
server.c
tmux.c
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1784,6 +1784,8 @@ int server_client_open(struct client *, char **); void server_client_unref(struct client *); void server_client_lost(struct client *); void server_client_loop(void); +void server_client_push_stdout(struct client *); +void server_client_push_stderr(struct client *); /* server-fn.c */ void server_fill_environ(struct session *, struct environ *); @@ -1809,8 +1811,6 @@ void server_destroy_session(struct session *); void server_check_unattached(void); void server_set_identify(struct client *); void server_clear_identify(struct client *); -void server_push_stdout(struct client *); -void server_push_stderr(struct client *); int server_set_stdin_callback(struct client *, void (*)(struct client *, int, void *), void *, char **); void server_unzoom_window(struct window *); |