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 6f9467c..f4d1d80 100644
--- a/src/beval.h
+++ b/src/beval.h
@@ -78,7 +78,6 @@
#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 a60d3c8..5513746 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -201,7 +201,9 @@
/* 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 324a360..48e3293 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1321,
+/**/
1320,
/**/
1319,
diff --git a/src/vim.h b/src/vim.h
index d5518f8..96bab71 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1809,14 +1809,15 @@
/* 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 */