Merge branch 'obsd-master'

Conflicts:
	server.c
	tmux.c

1 files changed, 2 insertions, 2 deletions

diff --git a/control.c b/control.c
index 11fa2d80..f7264944 100644
--- a/control.c
+++ b/control.c
@@ -37,7 +37,7 @@ control_write(struct client *c, const char *fmt, ...)
 	va_end(ap);
 
 	evbuffer_add(c->stdout_data, "\n", 1);
-	server_push_stdout(c);
+	server_client_push_stdout(c);
 }
 
 /* Write a buffer, adding a terminal newline. Empties buffer. */
@@ -46,7 +46,7 @@ control_write_buffer(struct client *c, struct evbuffer *buffer)
 {
 	evbuffer_add_buffer(c->stdout_data, buffer);
 	evbuffer_add(c->stdout_data, "\n", 1);
-	server_push_stdout(c);
+	server_client_push_stdout(c);
 }
 
 /* Control input callback. Read lines and fire commands. */