diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-13 15:58:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-13 15:58:58 +0200 |
| commit | 0d5f21c3dfaceed08b4cdb33a73eb16f680ff49b (patch) | |
| tree | c719e55a17f4123240a2d830d656db79bd3a0b9b | |
| parent | 42335f50bc6fac444a8af74c81df8369d722a6fb (diff) | |
patch 8.1.0378: CI build failurev8.1.0378
Problem: CI build failure.
Solution: Include vim.h as ../vim.h. Fix compiler warning.
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xdiff/xdiff.h | 2 | ||||
| -rw-r--r-- | src/xdiff/xpatience.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/version.c b/src/version.c index 18acc39b30..2e64eecbc7 100644 --- 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 index 476b20c72c..a8bc1dced4 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 c1871296af..00af0ff11c 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; |