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/os | |
| 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/os')
| -rw-r--r-- | src/nvim/os/shell.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c index 2d97c4bf4f..57e25560de 100644 --- a/src/nvim/os/shell.c +++ b/src/nvim/os/shell.c @@ -9,7 +9,7 @@ #include "nvim/lib/kvec.h" #include "nvim/log.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/os/shell.h" #include "nvim/os/signal.h" @@ -205,7 +205,7 @@ static int do_os_system(char **argv, xstrlcpy(prog, argv[0], MAXPATHL); Stream in, out, err; - UvProcess uvproc = uv_process_init(&loop, &buf); + LibuvProcess uvproc = libuv_process_init(&loop, &buf); Process *proc = &uvproc.process; Queue *events = queue_new_child(loop.events); proc->events = events; |