aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0378: CI build failure

Browse Source 
Problem:    CI build failure.
Solution:   Include vim.h as ../vim.h.  Fix compiler warning.
This commit is contained in:
Bram Moolenaar 2018-09-13 15:58:58 +02:00
parent 42335f50bc
commit 0d5f21c3df
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
378,
/**/ /**/
377, 377,
/**/ /**/

2
src/xdiff/xdiff.h
View File

@ -108,7 +108,7 @@ typedef struct s_bdiffparam {
long bsize; long bsize;
} bdiffparam_t; } bdiffparam_t;
#include "vim.h" #include "../vim.h"
#define xdl_malloc(x) lalloc((x), TRUE) #define xdl_malloc(x) lalloc((x), TRUE)
#define xdl_free(ptr) vim_free(ptr) #define xdl_free(ptr) vim_free(ptr)

2
src/xdiff/xpatience.c
View File

@ -206,7 +206,7 @@ static int binary_search(struct entry **sequence, int longest,
*/ */
static struct entry *find_longest_common_sequence(struct hashmap *map) 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; int longest = 0, i;
struct entry *entry; struct entry *entry;