From 40e280d949fa26e33f69c4bf80ccc0b70f2e13f6 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 19 Nov 2017 20:34:59 +0100
Subject: [PATCH] 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.
---
 src/beval.h   | 1 -
 src/proto.h   | 4 +++-
 src/version.c | 2 ++
 src/vim.h     | 7 ++++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/beval.h b/src/beval.h
index 6f9467cd6..f4d1d80e9 100644
--- 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 a60d3c895..5513746dd 100644
--- 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 324a3601d..48e329382 100644
--- 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 d5518f81d..96bab71cf 100644
--- 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 */
-- 
2.40.0