Windows: avoid "uv_" naming conflicts. #3225

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;

src/nvim/event/libuv_process.c

@@ -6,14 +6,14 @@
 #include "nvim/event/rstream.h"
 #include "nvim/event/wstream.h"
 #include "nvim/event/process.h"
-#include "nvim/event/uv_process.h"
+#include "nvim/event/libuv_process.h"
 #include "nvim/log.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "event/uv_process.c.generated.h"
+# include "event/libuv_process.c.generated.h"
 #endif
 
-bool uv_process_spawn(UvProcess *uvproc)
+bool libuv_process_spawn(LibuvProcess *uvproc)
   FUNC_ATTR_NONNULL_ALL
 {
   Process *proc = (Process *)uvproc;
@@ -55,7 +55,7 @@ bool uv_process_spawn(UvProcess *uvproc)
   return true;
 }
 
-void uv_process_close(UvProcess *uvproc)
+void libuv_process_close(LibuvProcess *uvproc)
   FUNC_ATTR_NONNULL_ARG(1)
 {
   uv_close((uv_handle_t *)&uvproc->uv, close_cb);

src/nvim/event/libuv_process.h

@@ -0,0 +1,25 @@
+#ifndef NVIM_EVENT_LIBUV_PROCESS_H
+#define NVIM_EVENT_LIBUV_PROCESS_H
+
+#include <uv.h>
+
+#include "nvim/event/process.h"
+
+typedef struct libuv_process {
+  Process process;
+  uv_process_t uv;
+  uv_process_options_t uvopts;
+  uv_stdio_container_t uvstdio[3];
+} LibuvProcess;
+
+static inline LibuvProcess libuv_process_init(Loop *loop, void *data)
+{
+  LibuvProcess rv;
+  rv.process = process_init(loop, kProcessTypeUv, data);
+  return rv;
+}
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "event/libuv_process.h.generated.h"
+#endif
+#endif  // NVIM_EVENT_LIBUV_PROCESS_H

src/nvim/event/process.c

@@ -8,7 +8,7 @@
 #include "nvim/event/rstream.h"
 #include "nvim/event/wstream.h"
 #include "nvim/event/process.h"
-#include "nvim/event/uv_process.h"
+#include "nvim/event/libuv_process.h"
 #include "nvim/event/pty_process.h"
 #include "nvim/globals.h"
 #include "nvim/log.h"
@@ -47,7 +47,7 @@ bool process_spawn(Process *proc) FUNC_ATTR_NONNULL_ALL
   bool success;
   switch (proc->type) {
     case kProcessTypeUv:
-      success = uv_process_spawn((UvProcess *)proc);
+      success = libuv_process_spawn((LibuvProcess *)proc);
       break;
     case kProcessTypePty:
       success = pty_process_spawn((PtyProcess *)proc);
@@ -68,7 +68,7 @@ bool process_spawn(Process *proc) FUNC_ATTR_NONNULL_ALL
     }
 
     if (proc->type == kProcessTypeUv) {
-      uv_close((uv_handle_t *)&(((UvProcess *)proc)->uv), NULL);
+      uv_close((uv_handle_t *)&(((LibuvProcess *)proc)->uv), NULL);
     } else {
       process_close(proc);
     }
@@ -307,7 +307,7 @@ static void process_close(Process *proc)
   proc->closed = true;
   switch (proc->type) {
     case kProcessTypeUv:
-      uv_process_close((UvProcess *)proc);
+      libuv_process_close((LibuvProcess *)proc);
       break;
     case kProcessTypePty:
       pty_process_close((PtyProcess *)proc);

src/nvim/event/uv_process.h

@@ -1,25 +0,0 @@
-#ifndef NVIM_EVENT_UV_PROCESS_H
-#define NVIM_EVENT_UV_PROCESS_H
-
-#include <uv.h>
-
-#include "nvim/event/process.h"
-
-typedef struct uv_process {
-  Process process;
-  uv_process_t uv;
-  uv_process_options_t uvopts;
-  uv_stdio_container_t uvstdio[3];
-} UvProcess;
-
-static inline UvProcess uv_process_init(Loop *loop, void *data)
-{
-  UvProcess rv;
-  rv.process = process_init(loop, kProcessTypeUv, data);
-  return rv;
-}
-
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "event/uv_process.h.generated.h"
-#endif
-#endif  // NVIM_EVENT_UV_PROCESS_H

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;

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;