diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
commit | ad56f2c46ac6deec86870ec10f2a11a644df07d4 (patch) | |
tree | 89f2d90c5586560911e67c872b530c77f151168d /input/ipc-unix.c | |
parent | 0536841647ef7931bffb4386d8ffbb5b2b568e8a (diff) | |
parent | 393bb2a565dc1e27812e1dd20747814892f80da2 (diff) | |
download | mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.bz2 mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.xz |
Merge branch 'master' into release/current
Diffstat (limited to 'input/ipc-unix.c')
-rw-r--r-- | input/ipc-unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/input/ipc-unix.c b/input/ipc-unix.c index 8b8a158c5f..12d7018c9e 100644 --- a/input/ipc-unix.c +++ b/input/ipc-unix.c @@ -134,7 +134,7 @@ static void *client_thread(void *p) if (fds[0].revents & POLLIN) { char discard[100]; - read(pipe_fd, discard, sizeof(discard)); + (void)read(pipe_fd, discard, sizeof(discard)); while (1) { mpv_event *event = mpv_wait_event(arg->client, 0); @@ -413,7 +413,7 @@ void mp_uninit_ipc(struct mp_ipc_ctx *arg) if (!arg) return; - write(arg->death_pipe[1], &(char){0}, 1); + (void)write(arg->death_pipe[1], &(char){0}, 1); pthread_join(arg->thread, NULL); close(arg->death_pipe[0]); |