diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-12-09 23:00:03 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-12-09 23:07:28 +0100 |
| commit | 20620bae76deddd892df2d33f9e745efd5d8598b (patch) | |
| tree | 8c43e2387210e7a561dad08b2cda8e0370f0eb72 /src/nvim/fileio.c | |
| parent | 857a7312d015350c9637548310c7a187637d3ca4 (diff) | |
| parent | 4e2981081796c8618caa4bed30d12e1e8fc8ae08 (diff) | |
| download | rneovim-20620bae76deddd892df2d33f9e745efd5d8598b.tar.gz rneovim-20620bae76deddd892df2d33f9e745efd5d8598b.tar.bz2 rneovim-20620bae76deddd892df2d33f9e745efd5d8598b.zip | |
Merge #9306 'vim-patch: integrate xdiff library'
closes #1466
closes #1007
closes #1391
Diffstat (limited to 'src/nvim/fileio.c')
| -rw-r--r-- | src/nvim/fileio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 7e8a7d1a35..8e5455bc67 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -1739,13 +1739,13 @@ failed: close(0); #ifndef WIN32 // On Unix, use stderr for stdin, makes shell commands work. - ignored = dup(2); + vim_ignored = dup(2); #else // On Windows, use the console input handle for stdin. HANDLE conin = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, (LPSECURITY_ATTRIBUTES)NULL, OPEN_EXISTING, 0, (HANDLE)NULL); - ignored = _open_osfhandle(conin, _O_RDONLY); + vim_ignored = _open_osfhandle(conin, _O_RDONLY); #endif } |