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/eval.c | |
| 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/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 2eb0194d85..3c9d725667 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -84,7 +84,7 @@ #include "nvim/version.h" #include "nvim/window.h" #include "nvim/os/os.h" -#include "nvim/event/uv_process.h" +#include "nvim/event/libuv_process.h" #include "nvim/event/pty_process.h" #include "nvim/event/rstream.h" #include "nvim/event/wstream.h" @@ -456,7 +456,7 @@ static dictitem_T vimvars_var; /* variable used for v: */ typedef struct { union { - UvProcess uv; + LibuvProcess uv; PtyProcess pty; } proc; Stream in, out, err; @@ -21100,7 +21100,7 @@ static inline TerminalJobData *common_job_init(char **argv, ufunc_T *on_stdout, if (pty) { data->proc.pty = pty_process_init(&loop, data); } else { - data->proc.uv = uv_process_init(&loop, data); + data->proc.uv = libuv_process_init(&loop, data); } Process *proc = (Process *)&data->proc; proc->argv = argv; |