From 0d5f21c3dfaceed08b4cdb33a73eb16f680ff49b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 15:58:58 +0200 Subject: patch 8.1.0378: CI build failure Problem: CI build failure. Solution: Include vim.h as ../vim.h. Fix compiler warning. --- src/xdiff/xdiff.h | 2 +- src/xdiff/xpatience.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/xdiff') diff --git a/src/xdiff/xdiff.h b/src/xdiff/xdiff.h index 476b20c72..a8bc1dced 100644 --- 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 index c1871296a..00af0ff11 100644 --- a/src/xdiff/xpatience.c +++ b/src/xdiff/xpatience.c @@ -206,7 +206,7 @@ static int binary_search(struct entry **sequence, int longest, */ 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; -- cgit v1.2.1