thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0941: macros for MS-Windows are inconsistent

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2019-02-17 17:44:42 +01:00
parent 78d21dae9c
commit 4f97475d32
68 changed files with 537 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/message.c
View File

@@ -2556,7 +2556,7 @@ t_puts(
msg_use_printf(void)
{
return (!msg_check_screen()
#if defined(WIN3264) && !defined(FEAT_GUI_MSWIN)
#if defined(MSWIN) && !defined(FEAT_GUI_MSWIN)
|| !termcap_active
#endif
|| (swapping_screen() && !termcap_active)
@@ -2573,7 +2573,7 @@ msg_puts_printf(char_u *str, int maxlen)
char_u *buf = NULL;
char_u *p = s;
#ifdef WIN3264
#ifdef MSWIN
if (!(silent_mode && p_verbose == 0))
mch_settmode(TMODE_COOK); /* handle CR and NL correctly */
#endif
@@ -2633,7 +2633,7 @@ msg_puts_printf(char_u *str, int maxlen)
msg_didout = TRUE; // assume that line is not empty
#ifdef WIN3264
#ifdef MSWIN
if (!(silent_mode && p_verbose == 0))
mch_settmode(TMODE_RAW);
#endif
@@ -2934,7 +2934,7 @@ do_more_prompt(int typed_char)
void
mch_errmsg(char *str)
{
#if defined(WIN3264) && !defined(FEAT_GUI_MSWIN)
#if defined(MSWIN) && !defined(FEAT_GUI_MSWIN)
int len = (int)STRLEN(str);
DWORD nwrite = 0;
DWORD mode = 0;
@@ -3022,7 +3022,7 @@ mch_errmsg(char *str)
void
mch_msg(char *str)
{
#if defined(WIN3264) && !defined(FEAT_GUI_MSWIN)
#if defined(MSWIN) && !defined(FEAT_GUI_MSWIN)
int len = (int)STRLEN(str);
DWORD nwrite = 0;
DWORD mode;
@@ -4008,7 +4008,7 @@ do_browse(
filter = BROWSE_FILTER_DEFAULT;
if (flags & BROWSE_DIR)
{
# if defined(FEAT_GUI_GTK) || defined(WIN3264)
# if defined(FEAT_GUI_GTK) || defined(MSWIN)
/* For systems that have a directory dialog. */
fname = gui_mch_browsedir(title, initdir);
# else
@@ -4754,7 +4754,7 @@ vim_vsnprintf_typval(
else if (length_modifier == 'L')
{
# ifdef FEAT_NUM64
# ifdef WIN3264
# ifdef MSWIN
f[f_l++] = 'I';
f[f_l++] = '6';
f[f_l++] = '4';