Mercurial > vim
diff src/globals.h @ 14730:193471015e1a v8.1.0377
patch 8.1.0377: xdiff doesn't use the Vim memory allocation functions
commit https://github.com/vim/vim/commit/42335f50bc6fac444a8af74c81df8369d722a6fb
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 13 15:33:43 2018 +0200
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".
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 13 Sep 2018 15:45:05 +0200 |
parents | 0a3b9ecf7cb8 |
children | 67e3103d6e18 |
line wrap: on
line diff
--- a/src/globals.h +++ b/src/globals.h @@ -1621,8 +1621,8 @@ EXTERN FILE *time_fd INIT(= NULL); /* w * 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 */