Windows: avoid "uv_" naming conflicts. #3225

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

View File

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