aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2015-11-18 16:42:25 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2015-11-18 16:42:25 +0000
commita58eaec5403d39f2e89e79146a0ffbb90a956679 (patch)
tree07928a20cc78ba386cf1fb20b9aa09e90961fecd /server-client.c
parent8b4b3ff4fcc73578f66697b158b56fdc28895368 (diff)
parent7fe8edc3962d5c30bf87677ecb2cf8633404f63c (diff)
downloadrtmux-a58eaec5403d39f2e89e79146a0ffbb90a956679.tar.gz
rtmux-a58eaec5403d39f2e89e79146a0ffbb90a956679.tar.bz2
rtmux-a58eaec5403d39f2e89e79146a0ffbb90a956679.zip
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/server-client.c b/server-client.c
index 6c8b121a..cf7e2582 100644
--- a/server-client.c
+++ b/server-client.c
@@ -244,7 +244,7 @@ server_client_unref(struct client *c)
/* Free dead client. */
void
-server_client_free(unused int fd, unused short events, void *arg)
+server_client_free(__unused int fd, __unused short events, void *arg)
{
struct client *c = arg;
@@ -826,7 +826,7 @@ server_client_reset_state(struct client *c)
/* Repeat time callback. */
void
-server_client_repeat_timer(unused int fd, unused short events, void *data)
+server_client_repeat_timer(__unused int fd, __unused short events, void *data)
{
struct client *c = data;
@@ -1227,7 +1227,7 @@ server_client_dispatch_shell(struct client *c)
/* Event callback to push more stdout data if any left. */
static void
-server_client_stdout_cb(unused int fd, unused short events, void *arg)
+server_client_stdout_cb(__unused int fd, __unused short events, void *arg)
{
struct client *c = arg;
@@ -1268,7 +1268,7 @@ server_client_push_stdout(struct client *c)
/* Event callback to push more stderr data if any left. */
static void
-server_client_stderr_cb(unused int fd, unused short events, void *arg)
+server_client_stderr_cb(__unused int fd, __unused short events, void *arg)
{
struct client *c = arg;