From b9d17c6a8a6485bc7a33cabbfafb9c60741e6943 Mon Sep 17 00:00:00 2001
From: Seth Jackson <sethjackson@gmail.com>
Date: Mon, 24 Aug 2015 20:09:27 -0400
Subject: Windows: avoid "uv_" naming conflicts. #3225

---
 src/nvim/eval.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/nvim/eval.c')

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