thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1314: build fails on Mac

Browse Source 
Problem:    Build fails on Mac. (chdiza)
Solution:   Add #ifdef around GUI fields.
This commit is contained in:
Bram Moolenaar
2017-11-18 22:49:58 +01:00
parent d1c28346e1
commit 4ab9d9e9a4
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/beval.h
View File

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

2
src/version.c
View File

@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1314,
/**/ /**/
1313, 1313,
/**/ /**/