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.0.1321: can't build huge version with Athena

Browse Source 
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.
This commit is contained in:
Bram Moolenaar 2017-11-19 20:34:59 +01:00
parent 7221fce8b3
commit 40e280d949
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/beval.h
View File

@ -78,7 +78,6 @@ typedef struct BalloonEvalStruct
#define EVAL_OFFSET_X 15 /* displacement of beval topleft corner from pointer */ #define EVAL_OFFSET_X 15 /* displacement of beval topleft corner from pointer */
#define EVAL_OFFSET_Y 10 #define EVAL_OFFSET_Y 10
#include "beval.pro"
#ifdef FEAT_BEVAL_GUI #ifdef FEAT_BEVAL_GUI
# include "gui_beval.pro" # include "gui_beval.pro"
#endif #endif

4
src/proto.h
View File

@ -201,7 +201,9 @@ void qsort(void *base, size_t elm_count, size_t elm_size, int (*cmp)(const void
/* Ugly solution for "BalloonEval" not being defined while it's used in some /* Ugly solution for "BalloonEval" not being defined while it's used in some
* .pro files. */ * .pro files. */
# ifndef FEAT_BEVAL # ifdef FEAT_BEVAL
# include "beval.pro"
# else
# define BalloonEval int # define BalloonEval int
# endif # endif

2
src/version.c
View File

@ -771,6 +771,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 */
/**/
1321,
/**/ /**/
1320, 1320,
/**/ /**/

7
src/vim.h
View File

@ -1809,14 +1809,15 @@ typedef int sock_T;
/* Include option.h before structs.h, because the number of window-local and /* Include option.h before structs.h, because the number of window-local and
* buffer-local options is used there. */ * 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 */ /* 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 "alloc.h"
#include "beval.h"
/* Values for "do_profiling". */ /* Values for "do_profiling". */
#define PROF_NONE 0 /* profiling not started */ #define PROF_NONE 0 /* profiling not started */