Mercurial > vim
changeset 12889:0ebade0c0ab2 v8.0.1321
patch 8.0.1321: can't build huge version with Athena
commit https://github.com/vim/vim/commit/40e280d949fa26e33f69c4bf80ccc0b70f2e13f6
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 19 20:34:59 2017 +0100
patch 8.0.1321: can't build huge version with Athena
Problem: Can't build huge version with Athena. (Mark Kelly)
Solution: Move including beval.h to before structs.h. Include beval.pro like
other proto files.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 19 Nov 2017 20:45:05 +0100 |
parents | ee7c70c64d80 |
children | d41e34875d22 |
files | src/beval.h src/proto.h src/version.c src/vim.h |
diffstat | 4 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/beval.h +++ b/src/beval.h @@ -78,7 +78,6 @@ typedef struct BalloonEvalStruct #define EVAL_OFFSET_X 15 /* displacement of beval topleft corner from pointer */ #define EVAL_OFFSET_Y 10 -#include "beval.pro" #ifdef FEAT_BEVAL_GUI # include "gui_beval.pro" #endif
--- a/src/proto.h +++ b/src/proto.h @@ -201,7 +201,9 @@ void qsort(void *base, size_t elm_count, /* Ugly solution for "BalloonEval" not being defined while it's used in some * .pro files. */ -# ifndef FEAT_BEVAL +# ifdef FEAT_BEVAL +# include "beval.pro" +# else # define BalloonEval int # endif
--- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1321, +/**/ 1320, /**/ 1319,
--- a/src/vim.h +++ b/src/vim.h @@ -1809,14 +1809,15 @@ typedef int sock_T; /* Include option.h before structs.h, because the number of window-local and * buffer-local options is used there. */ -#include "option.h" /* options and default values */ +#include "option.h" /* options and default values */ + +#include "beval.h" /* BalloonEval */ /* Note that gui.h is included by structs.h */ -#include "structs.h" /* file that defines many structures */ +#include "structs.h" /* defines many structures */ #include "alloc.h" -#include "beval.h" /* Values for "do_profiling". */ #define PROF_NONE 0 /* profiling not started */