summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-09-13 15:33:43 +0200
committerBram Moolenaar <Bram@vim.org>2018-09-13 15:33:43 +0200
commit42335f50bc6fac444a8af74c81df8369d722a6fb (patch)
treefc6596503a515a25a7c2a046321108642848b935 /src/main.c
parentc787539747f6bb2510a56aa14dbf6808aff5681a (diff)
downloadvim-git-42335f50bc6fac444a8af74c81df8369d722a6fb.tar.gz
patch 8.1.0377: xdiff doesn't use the Vim memory allocation functionsv8.1.0377
Problem: Xdiff doesn't use the Vim memory allocation functions. Solution: Change the xdl_ defines. Check for out-of-memory. Rename "ignored" to "vim_ignored".
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index cb0676ce5..bf9b842f5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2632,7 +2632,7 @@ read_stdin(void)
* Is there any other system that cannot do this?
*/
close(0);
- ignored = dup(2);
+ vim_ignored = dup(2);
#endif
}