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/misc1.c | |
| 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/misc1.c')
| -rw-r--r-- | src/misc1.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/misc1.c b/src/misc1.c index 1d957908e..75f4ab1ef 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -14,7 +14,7 @@ #include "vim.h" #include "version.h" -#if defined(FEAT_CMDL_COMPL) && defined(WIN3264) +#if defined(FEAT_CMDL_COMPL) && defined(MSWIN) # include <lm.h> #endif @@ -3852,7 +3852,7 @@ init_homedir(void) var = mch_getenv((char_u *)"HOME"); #endif -#ifdef WIN3264 +#ifdef MSWIN /* * Typically, $HOME is not defined on Windows, unless the user has * specifically defined it for Vim's sake. However, on Windows NT @@ -4318,7 +4318,7 @@ vim_getenv(char_u *name, int *mustfree) if (p != NULL) { -#if defined(WIN3264) +#if defined(MSWIN) if (enc_utf8) { int len; @@ -4362,7 +4362,7 @@ vim_getenv(char_u *name, int *mustfree) else p = mch_getenv((char_u *)"VIM"); -#if defined(WIN3264) +#if defined(MSWIN) if (enc_utf8) { int len; @@ -4688,7 +4688,7 @@ init_users(void) add_user((char_u *)pw->pw_name, TRUE); endpwent(); } -# elif defined(WIN3264) +# elif defined(MSWIN) { DWORD nusers = 0, ntotal = 0, i; PUSER_INFO_0 uinfo; @@ -4820,7 +4820,7 @@ home_replace( #else homedir_env_orig = homedir_env = mch_getenv((char_u *)"HOME"); #endif -#ifdef WIN3264 +#ifdef MSWIN if (homedir_env == NULL) homedir_env_orig = homedir_env = mch_getenv((char_u *)"USERPROFILE"); #endif @@ -5619,7 +5619,7 @@ static int vim_backtick(char_u *p); static int expand_backtick(garray_T *gap, char_u *pat, int flags); # endif -# if defined(WIN3264) +# if defined(MSWIN) /* * File name expansion code for MS-DOS, Win16 and Win32. It's here because * it's shared between these systems. @@ -5898,7 +5898,7 @@ mch_expandpath( { return dos_expandpath(gap, path, 0, flags, FALSE); } -# endif /* WIN3264 */ +# endif // MSWIN #if (defined(UNIX) && !defined(VMS)) || defined(USE_UNIXFILENAME) \ || defined(PROTO) @@ -6646,7 +6646,7 @@ get_isolated_shell_name(void) { char_u *p; -#ifdef WIN3264 +#ifdef MSWIN p = gettail(p_sh); p = vim_strnsave(p, (int)(skiptowhite(p) - p)); #else |