Skip to content

Commit 4ab9d9e

Browse files
committed
patch 8.0.1314: build fails on Mac
Problem: Build fails on Mac. (chdiza) Solution: Add #ifdef around GUI fields.
1 parent d1c2834 commit 4ab9d9e

2 files changed

Lines changed: 15 additions & 10 deletions

File tree

src/beval.h

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ typedef enum
3232

3333
typedef struct BalloonEvalStruct
3434
{
35-
#ifdef FEAT_GUI_GTK
35+
#ifdef FEAT_BEVAL_GUI
36+
# ifdef FEAT_GUI_GTK
3637
GtkWidget *target; /* widget we are monitoring */
3738
GtkWidget *balloonShell;
3839
GtkWidget *balloonLabel;
@@ -41,8 +42,8 @@ typedef struct BalloonEvalStruct
4142
int x;
4243
int y;
4344
unsigned int state; /* Button/Modifier key state */
44-
#else
45-
# if !defined(FEAT_GUI_W32)
45+
# else
46+
# if !defined(FEAT_GUI_W32)
4647
Widget target; /* widget we are monitoring */
4748
Widget balloonShell;
4849
Widget balloonLabel;
@@ -54,22 +55,24 @@ typedef struct BalloonEvalStruct
5455
Position x_root;
5556
Position y_root;
5657
int state; /* Button/Modifier key state */
57-
# else
58+
# else
5859
HWND target;
5960
HWND balloon;
6061
int x;
6162
int y;
6263
BeState showState; /* tells us whats currently going on */
64+
# endif
6365
# endif
64-
#endif
65-
int ts; /* tabstop setting for this buffer */
66-
char_u *msg;
67-
void (*msgCB)(struct BalloonEvalStruct *, int);
68-
void *clientData; /* For callback */
69-
#if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)
66+
# if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)
7067
Dimension screen_width; /* screen width in pixels */
7168
Dimension screen_height; /* screen height in pixels */
69+
# endif
70+
void (*msgCB)(struct BalloonEvalStruct *, int);
71+
void *clientData; /* For callback */
7272
#endif
73+
74+
int ts; /* tabstop setting for this buffer */
75+
char_u *msg;
7376
} BalloonEval;
7477

7578
#define EVAL_OFFSET_X 15 /* displacement of beval topleft corner from pointer */

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,8 @@ static char *(features[]) =
771771

772772
static int included_patches[] =
773773
{ /* Add new patch number below this line */
774+
/**/
775+
1314,
774776
/**/
775777
1313,
776778
/**/

0 commit comments

Comments
 (0)