mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 07:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows: avoid "uv_" naming conflicts. #3225

Browse Source
This commit is contained in:
Seth Jackson
2015-08-24 20:09:27 -04:00
committed by Justin M. Keyes
parent 56fe0c956f
commit b9d17c6a8a
7 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/eval.c
View File

@@ -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;