Mercurial > vim
changeset 14732:2b3ea3d42344 v8.1.0378
patch 8.1.0378: CI build failure
commit https://github.com/vim/vim/commit/0d5f21c3dfaceed08b4cdb33a73eb16f680ff49b
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 13 15:58:58 2018 +0200
patch 8.1.0378: CI build failure
Problem: CI build failure.
Solution: Include vim.h as ../vim.h. Fix compiler warning.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 13 Sep 2018 16:00:07 +0200 |
parents | a98edad961b4 |
children | 15d60eacdbc8 |
files | src/version.c src/xdiff/xdiff.h src/xdiff/xpatience.c |
diffstat | 3 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 378, +/**/ 377, /**/ 376,
--- a/src/xdiff/xdiff.h +++ b/src/xdiff/xdiff.h @@ -108,7 +108,7 @@ typedef struct s_bdiffparam { long bsize; } bdiffparam_t; -#include "vim.h" +#include "../vim.h" #define xdl_malloc(x) lalloc((x), TRUE) #define xdl_free(ptr) vim_free(ptr)
--- a/src/xdiff/xpatience.c +++ b/src/xdiff/xpatience.c @@ -206,7 +206,7 @@ static int binary_search(struct entry ** */ static struct entry *find_longest_common_sequence(struct hashmap *map) { - struct entry **sequence = xdl_malloc(map->nr * sizeof(struct entry *)); + struct entry **sequence = (struct entry **)xdl_malloc(map->nr * sizeof(struct entry *)); int longest = 0, i; struct entry *entry;