diff options
| author | Seth Jackson <sethjackson@gmail.com> | 2015-08-24 20:09:27 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-08-27 21:47:49 -0400 |
| commit | b9d17c6a8a6485bc7a33cabbfafb9c60741e6943 (patch) | |
| tree | 9b9734bacf080b9571403020fc09fae1e8bf5722 /src/nvim/msgpack_rpc | |
| parent | 56fe0c956f6f446ea40a8ccb8be640b000b875e2 (diff) | |
| download | rneovim-b9d17c6a8a6485bc7a33cabbfafb9c60741e6943.tar.gz rneovim-b9d17c6a8a6485bc7a33cabbfafb9c60741e6943.tar.bz2 rneovim-b9d17c6a8a6485bc7a33cabbfafb9c60741e6943.zip | |
Windows: avoid "uv_" naming conflicts. #3225
Diffstat (limited to 'src/nvim/msgpack_rpc')
| -rw-r--r-- | src/nvim/msgpack_rpc/channel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c index d8f86cefab..45e78d6e79 100644 --- a/src/nvim/msgpack_rpc/channel.c +++ b/src/nvim/msgpack_rpc/channel.c @@ -10,7 +10,7 @@ #include "nvim/msgpack_rpc/channel.h" #include "nvim/msgpack_rpc/remote_ui.h" #include "nvim/event/loop.h" -#include "nvim/event/uv_process.h" +#include "nvim/event/libuv_process.h" #include "nvim/event/rstream.h" #include "nvim/event/wstream.h" #include "nvim/event/socket.h" @@ -55,7 +55,7 @@ typedef struct { union { Stream stream; struct { - UvProcess uvproc; + LibuvProcess uvproc; Stream in; Stream out; Stream err; @@ -119,7 +119,7 @@ void channel_teardown(void) uint64_t channel_from_process(char **argv) { Channel *channel = register_channel(kChannelTypeProc); - channel->data.process.uvproc = uv_process_init(&loop, channel); + channel->data.process.uvproc = libuv_process_init(&loop, channel); Process *proc = &channel->data.process.uvproc.process; proc->argv = argv; proc->in = &channel->data.process.in; |