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
index 18acc39b300f8481ef81c35373c92027ed0dd21c..2e64eecbc77cdc17bb36b0885addf8bc28fdf03b 100644 (file)
--- 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 476b20c72c5446e0cf9523757eef3fb5d94a6c3a..a8bc1dced423b423c55809abb75ec2c5223be1bb 100644 (file)
--- 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 c1871296af781e3a8c97133989b0b60a7c9e34ba..00af0ff11c1e5c9920897117411742d45f8aa65d 100644 (file)
--- 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;