diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-31 13:49:04 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-31 13:49:04 -0400 |
| commit | 3dd3d129d3a4644c3f2c4de4df4b2ceda380448e (patch) | |
| tree | 0c7358f88da7baec437c89f937e105a1e8adfbf9 /src/nvim/os/shell.c | |
| parent | 4276a03e8185e9498e4b7983bf02e151c4b4b197 (diff) | |
| parent | 77540a04582927e842c7d5522bb862756da2cbba (diff) | |
| download | rneovim-3dd3d129d3a4644c3f2c4de4df4b2ceda380448e.tar.gz rneovim-3dd3d129d3a4644c3f2c4de4df4b2ceda380448e.tar.bz2 rneovim-3dd3d129d3a4644c3f2c4de4df4b2ceda380448e.zip | |
Merge pull request #4844 from ZyX-I/rename-main-loop
Rename main loop variable from loop to main_loop
Diffstat (limited to 'src/nvim/os/shell.c')
| -rw-r--r-- | src/nvim/os/shell.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c index f5a1637c94..988620b145 100644 --- a/src/nvim/os/shell.c +++ b/src/nvim/os/shell.c @@ -14,6 +14,7 @@ #include "nvim/os/shell.h" #include "nvim/os/signal.h" #include "nvim/types.h" +#include "nvim/main.h" #include "nvim/vim.h" #include "nvim/message.h" #include "nvim/memory.h" @@ -205,16 +206,16 @@ static int do_os_system(char **argv, xstrlcpy(prog, argv[0], MAXPATHL); Stream in, out, err; - LibuvProcess uvproc = libuv_process_init(&loop, &buf); + LibuvProcess uvproc = libuv_process_init(&main_loop, &buf); Process *proc = &uvproc.process; - Queue *events = queue_new_child(loop.events); + Queue *events = queue_new_child(main_loop.events); proc->events = events; proc->argv = argv; proc->in = input != NULL ? &in : NULL; proc->out = &out; proc->err = &err; if (!process_spawn(proc)) { - loop_poll_events(&loop, 0); + loop_poll_events(&main_loop, 0); // Failed, probably due to `sh` not being executable if (!silent) { MSG_PUTS(_("\nCannot execute ")); |