From 0d5f21c3dfaceed08b4cdb33a73eb16f680ff49b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 13 Sep 2018 15:58:58 +0200
Subject: [PATCH] patch 8.1.0378: CI build failure
Problem: CI build failure.
Solution: Include vim.h as ../vim.h. Fix compiler warning.
---
src/version.c | 2 ++
src/xdiff/xdiff.h | 2 +-
src/xdiff/xpatience.c | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/version.c b/src/version.c
index 18acc39b3..2e64eecbc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 378,
/**/
377,
/**/
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;
--
2.40.0