Mercurial > vim
diff src/beval.h @ 15868:7fad90423bd2 v8.1.0941
patch 8.1.0941: macros for MS-Windows are inconsistent
commit https://github.com/vim/vim/commit/4f97475d326c2773a78561fb874e4f23c25cbcd9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 17 17:44:42 2019 +0100
patch 8.1.0941: macros for MS-Windows are inconsistent
Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and
others.
Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the
GUI build. (Hirohito Higashi, closes #3932)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 17 Feb 2019 17:45:08 +0100 |
| parents | e3dfd25b0679 |
| children | ff3c99bd1038 |
line wrap: on
line diff
--- a/src/beval.h +++ b/src/beval.h @@ -43,7 +43,7 @@ typedef struct BalloonEvalStruct int y; unsigned int state; /* Button/Modifier key state */ # else -# if !defined(FEAT_GUI_W32) +# if !defined(FEAT_GUI_MSWIN) Widget target; /* widget we are monitoring */ Widget balloonShell; Widget balloonLabel; @@ -63,7 +63,7 @@ typedef struct BalloonEvalStruct BeState showState; /* tells us whats currently going on */ # endif # endif -# if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32) +# if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MSWIN) Dimension screen_width; /* screen width in pixels */ Dimension screen_height; /* screen height in pixels */ # endif @@ -76,7 +76,7 @@ typedef struct BalloonEvalStruct int *vts; // vartabstop setting for this buffer #endif char_u *msg; -#ifdef FEAT_GUI_W32 +#ifdef FEAT_GUI_MSWIN void *tofree; #endif } BalloonEval;