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/option.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/option.h')
| -rw-r--r-- | src/option.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/option.h b/src/option.h index 2f1d322bf..782452006 100644 --- a/src/option.h +++ b/src/option.h @@ -18,7 +18,7 @@ #ifdef AMIGA # define DFLT_EFM "%f>%l:%c:%t:%n:%m,%f:%l: %t%*\\D%n: %m,%f %l %t%*\\D%n: %m,%*[^\"]\"%f\"%*\\D%l: %m,%f:%l:%m,%f|%l| %m" #else -# if defined(WIN3264) +# if defined(MSWIN) # define DFLT_EFM "%f(%l) \\=: %t%*\\D%n: %m,%*[^\"]\"%f\"%*\\D%l: %m,%f(%l) \\=: %m,%*[^ ] %f %l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,%f|%l| %m" # else # if defined(__QNX__) @@ -546,10 +546,6 @@ EXTERN long p_hi; /* 'history' */ #ifdef FEAT_RIGHTLEFT EXTERN int p_hkmap; /* 'hkmap' */ EXTERN int p_hkmapp; /* 'hkmapp' */ -# ifdef FEAT_FKMAP -EXTERN int p_fkmap; /* 'fkmap' */ -EXTERN int p_altkeymap; /* 'altkeymap' */ -# endif # ifdef FEAT_ARABIC EXTERN int p_arshape; /* 'arabicshape' */ # endif @@ -694,7 +690,7 @@ EXTERN long p_report; /* 'report' */ #if defined(FEAT_QUICKFIX) EXTERN long p_pvh; /* 'previewheight' */ #endif -#ifdef WIN3264 +#ifdef MSWIN EXTERN int p_rs; /* 'restorescreen' */ #endif #ifdef FEAT_RIGHTLEFT @@ -827,7 +823,7 @@ EXTERN char_u *p_tenc; /* 'termencoding' */ #ifdef FEAT_TERMGUICOLORS EXTERN int p_tgc; /* 'termguicolors' */ #endif -#if defined(WIN3264) && defined(FEAT_TERMINAL) +#if defined(MSWIN) && defined(FEAT_TERMINAL) EXTERN char_u *p_twt; // 'termwintype' #endif EXTERN int p_terse; /* 'terse' */ @@ -848,7 +844,7 @@ EXTERN int p_ttimeout; /* 'ttimeout' */ EXTERN long p_ttm; /* 'ttimeoutlen' */ EXTERN int p_tbi; /* 'ttybuiltin' */ EXTERN int p_tf; /* 'ttyfast' */ -#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) +#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_MSWIN) EXTERN char_u *p_toolbar; /* 'toolbar' */ EXTERN unsigned toolbar_flags; # ifdef IN_OPTION_C @@ -945,7 +941,7 @@ EXTERN long p_wh; /* 'winheight' */ EXTERN long p_wmh; /* 'winminheight' */ EXTERN long p_wmw; /* 'winminwidth' */ EXTERN long p_wiw; /* 'winwidth' */ -#if defined(WIN3264) && defined(FEAT_TERMINAL) +#if defined(MSWIN) && defined(FEAT_TERMINAL) EXTERN char_u *p_winptydll; /* 'winptydll' */ #endif EXTERN int p_ws; /* 'wrapscan' */ |