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.

diff --git a/src/beval.h b/src/beval.h
index 6f9467cd6b8ab17ada8bf2004f2172355cb55846..f4d1d80e9a373617d78432f5f37892f13b9031e0 100644 (file)
--- 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

diff --git a/src/proto.h b/src/proto.h
index a60d3c895988c44d9d640fe61d9f6fba144f1792..5513746dd9615af2015419a4e125c96e0b8c9afb 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -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
  * .pro files. */
-# ifndef FEAT_BEVAL
+# ifdef FEAT_BEVAL
+#  include "beval.pro"
+# else
 #  define BalloonEval int
 # endif
 

diff --git a/src/version.c b/src/version.c
index 324a3601d0025397c71bba4c7082fcd4a2ae5745..48e32938226f9352a19e1af18b515ecb9e25ce76 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1321,
 /**/
     1320,
 /**/

diff --git a/src/vim.h b/src/vim.h
index d5518f81d45e51dc3990d56aee826d3e5347e4d1..96bab71cff19299865a90bc1bebd68d1b57d341e 100644 (file)
--- 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 */