aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/event/socket.c
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2016-08-20 12:58:37 +0200
committerGitHub <noreply@github.com>2016-08-20 12:58:37 +0200
commit71b3e20d0fba20d4957c1949352bde1744a0a947 (patch)
tree7844b2d185b27a0303183e90792a5ef807933e88 /src/nvim/event/socket.c
parent1b825a9ada4d89059645bc7a458e1e8d931c6161 (diff)
parent2d60a15e25f487eda1ac00a9e6cdf9a6564fb416 (diff)
downloadrneovim-71b3e20d0fba20d4957c1949352bde1744a0a947.tar.gz
rneovim-71b3e20d0fba20d4957c1949352bde1744a0a947.tar.bz2
rneovim-71b3e20d0fba20d4957c1949352bde1744a0a947.zip
Merge pull request #4723 from bfredl/rpcstderr
allow stderr handler for rpc jobs and use it to display python/ruby startup error
Diffstat (limited to 'src/nvim/event/socket.c')
-rw-r--r--src/nvim/event/socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/event/socket.c b/src/nvim/event/socket.c
index cdaf40849b..8f9327f3d4 100644
--- a/src/nvim/event/socket.c
+++ b/src/nvim/event/socket.c
@@ -113,7 +113,7 @@ int socket_watcher_start(SocketWatcher *watcher, int backlog, socket_cb cb)
return 0;
}
-int socket_watcher_accept(SocketWatcher *watcher, Stream *stream, void *data)
+int socket_watcher_accept(SocketWatcher *watcher, Stream *stream)
FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_ARG(2)
{
uv_stream_t *client;
@@ -133,7 +133,7 @@ int socket_watcher_accept(SocketWatcher *watcher, Stream *stream, void *data)
return result;
}
- stream_init(NULL, stream, -1, client, data);
+ stream_init(NULL, stream, -1, client);
return 0;
}