diff options
Diffstat (limited to 'src/xdiff/xdiff.h')
| -rw-r--r-- | src/xdiff/xdiff.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xdiff/xdiff.h b/src/xdiff/xdiff.h index 3994f66fe..a9169d30c 100644 --- a/src/xdiff/xdiff.h +++ b/src/xdiff/xdiff.h @@ -66,6 +66,7 @@ extern "C" { /* merge output styles */ #define XDL_MERGE_DIFF3 1 +#define XDL_MERGE_ZEALOUS_DIFF3 2 typedef struct s_mmfile { char *ptr; @@ -126,6 +127,7 @@ typedef struct s_bdiffparam { #endif #define xdl_malloc(x) lalloc((x), TRUE) +#define xdl_calloc(n, sz) lalloc_clear(n*sz, TRUE) #define xdl_free(ptr) vim_free(ptr) #define xdl_realloc(ptr,x) vim_realloc((ptr),(x)) |