# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1511042405 -3600
# Node ID 9aacdf8a242577d8dde6175c4efb69096ded5b25
# Parent  86ffdb6b3e28737de0461a89382db9f5f2fad89f
patch 8.0.1314: build fails on Mac

commit https://github.com/vim/vim/commit/4ab9d9e9a41f441d7d96f51fec2213d412ea64e7
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Nov 18 22:49:58 2017 +0100

    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
--- 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
+# 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;
-    void		(*msgCB)(struct BalloonEvalStruct *, int);
-    void		*clientData;	/* For callback */
-#if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)
-    Dimension		screen_width;	/* screen width in pixels */
-    Dimension		screen_height;	/* screen height in pixels */
-#endif
 } BalloonEval;
 
 #define EVAL_OFFSET_X 15 /* displacement of beval topleft corner from pointer */
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1314,
+/**/
     1313,
 /**/
     1312,