commit 42335f50bc6fac444a8af74c81df8369d722a6fb
author Bram Moolenaar <Bram@vim.org> Thu Sep 13 15:33:43 2018 +0200
committer Bram Moolenaar <Bram@vim.org> Thu Sep 13 15:33:43 2018 +0200
tree fc6596503a515a25a7c2a046321108642848b935
parent c787539747f6bb2510a56aa14dbf6808aff5681a

patch 8.1.0377: xdiff doesn't use the Vim memory allocation functions

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".

src/globals.h

diff --git a/src/globals.h b/src/globals.h
index 3f5b61f..511479d 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1621,8 +1621,8 @@
  * can't do anything useful with the value.  Assign to this variable to avoid
  * the warning.
  */
-EXTERN int ignored;
-EXTERN char *ignoredp;
+EXTERN int vim_ignored;
+EXTERN char *vim_ignoredp;
 
 #ifdef FEAT_EVAL
 /* set by alloc_fail(): ID */