aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

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
Show Stats 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
{
#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 */

2
src/version.c
View File

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