patch 8.0.1314: build fails on Mac

Problem:    Build fails on Mac. (chdiza)
Solution:   Add #ifdef around GUI fields.

diff --git a/src/beval.h b/src/beval.h
index d157a9e7900cb7d5779caaa2c71a624491dd4723..6f9467cd6b8ab17ada8bf2004f2172355cb55846 100644 (file)
--- a/src/beval.h
+++ b/src/beval.h
@@ -32,7 +32,8 @@ typedef enum
 
 typedef struct BalloonEvalStruct
 {
-#ifdef FEAT_GUI_GTK
+#ifdef FEAT_BEVAL_GUI
+# ifdef FEAT_GUI_GTK
     GtkWidget          *target;        /* widget we are monitoring */
     GtkWidget          *balloonShell;
     GtkWidget          *balloonLabel;
@@ -41,8 +42,8 @@ typedef struct BalloonEvalStruct
     int                        x;
     int                        y;
     unsigned int       state;          /* Button/Modifier key state */
-#else
-# if !defined(FEAT_GUI_W32)
+# else
+#  if !defined(FEAT_GUI_W32)
     Widget             target;         /* widget we are monitoring */
     Widget             balloonShell;
     Widget             balloonLabel;
@@ -54,22 +55,24 @@ typedef struct BalloonEvalStruct
     Position           x_root;
     Position           y_root;
     int                        state;          /* Button/Modifier key state */
-# else
+#  else
     HWND               target;
     HWND               balloon;
     int                        x;
     int                        y;
     BeState            showState;      /* tells us whats currently going on */
+#  endif
 # endif
-#endif
-    int                        ts;             /* tabstop setting for this buffer */
-    char_u             *msg;
-    void               (*msgCB)(struct BalloonEvalStruct *, int);
-    void               *clientData;    /* For callback */
-#if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)
+# if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)
     Dimension          screen_width;   /* screen width in pixels */
     Dimension          screen_height;  /* screen height in pixels */
+# endif
+    void               (*msgCB)(struct BalloonEvalStruct *, int);
+    void               *clientData;    /* For callback */
 #endif
+
+    int                        ts;             /* tabstop setting for this buffer */
+    char_u             *msg;
 } BalloonEval;
 
 #define EVAL_OFFSET_X 15 /* displacement of beval topleft corner from pointer */

diff --git a/src/version.c b/src/version.c
index e3f1428f582a3cc83becf7f116110feb75a78473..202d21d3b3848371181c143534eebadc87cb6430 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 */
+/**/
+    1314,
 /**/
     1313,
 /**/