diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-02-17 17:44:42 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-02-17 17:44:42 +0100 |
commit | 4f97475d326c2773a78561fb874e4f23c25cbcd9 (patch) | |
tree | 7e066bc70556dfbb415ddb9f364e8432e8aaf189 /src/gui.h | |
parent | 78d21dae9c3a39efb30316d3e38dce120bc1abbd (diff) | |
download | vim-git-4f97475d326c2773a78561fb874e4f23c25cbcd9.tar.gz |
patch 8.1.0941: macros for MS-Windows are inconsistentv8.1.0941
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)
Diffstat (limited to 'src/gui.h')
-rw-r--r-- | src/gui.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -90,7 +90,7 @@ * X_2_COL - Convert X pixel coord into character column. * Y_2_ROW - Convert Y pixel coord into character row. */ -#ifdef FEAT_GUI_W32 +#ifdef FEAT_GUI_MSWIN # define TEXT_X(col) ((col) * gui.char_width) # define TEXT_Y(row) ((row) * gui.char_height + gui.char_ascent) # define FILL_X(col) ((col) * gui.char_width) @@ -406,7 +406,7 @@ typedef struct Gui #endif /* FEAT_GUI_GTK */ #if defined(FEAT_GUI_TABLINE) \ - && (defined(FEAT_GUI_W32) || defined(FEAT_GUI_MOTIF) \ + && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \ || defined(FEAT_GUI_MAC)) int tabline_height; #endif |