# HG changeset patch # User Christian Brabandt # Date 1536847207 -7200 # Node ID 2b3ea3d42344341957587b82e2a300e8ed68b5ac # Parent a98edad961b4233eff11ca2d3bc5ffb4f979c33b patch 8.1.0378: CI build failure commit https://github.com/vim/vim/commit/0d5f21c3dfaceed08b4cdb33a73eb16f680ff49b Author: Bram Moolenaar 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. diff --git a/src/version.c b/src/version.c --- 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, diff --git a/src/xdiff/xdiff.h b/src/xdiff/xdiff.h --- 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) diff --git a/src/xdiff/xpatience.c b/src/xdiff/xpatience.c --- 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;