diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-18 22:49:58 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-18 22:49:58 +0100 |
| commit | 4ab9d9e9a41f441d7d96f51fec2213d412ea64e7 (patch) | |
| tree | e382229180e8ad59fd8cad8656c9738643033797 /src/beval.h | |
| parent | d1c28346e194ecf2303fe744052fb7cedc28fcfa (diff) | |
patch 8.0.1314: build fails on Macv8.0.1314
Problem: Build fails on Mac. (chdiza)
Solution: Add #ifdef around GUI fields.
Diffstat (limited to 'src/beval.h')
| -rw-r--r-- | src/beval.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/beval.h b/src/beval.h index d157a9e790..6f9467cd6b 100644 --- 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 -#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 */ |