summaryrefslogtreecommitdiff
path: root/src/os_win32.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/os_win32.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/os_win32.c')
-rw-r--r--src/os_win32.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index 9d36dec4a..b665815f8 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -4388,7 +4388,8 @@ sub_process_writer(LPVOID param)
&& (lnum != curbuf->b_ml.ml_line_count
|| curbuf->b_p_eol)))
{
- WriteFile(g_hChildStd_IN_Wr, "\n", 1, (LPDWORD)&ignored, NULL);
+ WriteFile(g_hChildStd_IN_Wr, "\n", 1,
+ (LPDWORD)&vim_ignored, NULL);
}
++lnum;