Mercurial > vim
changeset 12875:9aacdf8a2425 v8.0.1314
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 18 Nov 2017 23:00:05 +0100 |
| parents | 86ffdb6b3e28 |
| children | c460375c058e |
| files | src/beval.h src/version.c |
| diffstat | 2 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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 */