mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
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)
This commit is contained in:
18
src/eval.c
18
src/eval.c
@@ -7460,7 +7460,7 @@ tv_get_string_buf_chk(typval_T *varp, char_u *buf)
|
||||
# ifdef UNIX
|
||||
vim_snprintf((char *)buf, NUMBUFLEN,
|
||||
"process %ld %s", (long)job->jv_pid, status);
|
||||
# elif defined(WIN32)
|
||||
# elif defined(MSWIN)
|
||||
vim_snprintf((char *)buf, NUMBUFLEN,
|
||||
"process %ld %s",
|
||||
(long)job->jv_proc_info.dwProcessId,
|
||||
@@ -9956,7 +9956,7 @@ var_exists(char_u *var)
|
||||
|
||||
#if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) || defined(PROTO)
|
||||
|
||||
#ifdef WIN3264
|
||||
#ifdef MSWIN
|
||||
/*
|
||||
* Functions for ":8" filename modifier: get 8.3 version of a filename.
|
||||
*/
|
||||
@@ -10191,7 +10191,7 @@ shortpath_for_partial(
|
||||
|
||||
return OK;
|
||||
}
|
||||
#endif /* WIN3264 */
|
||||
#endif // MSWIN
|
||||
|
||||
/*
|
||||
* Adjust a filename, according to a string of modifiers.
|
||||
@@ -10215,7 +10215,7 @@ modify_fname(
|
||||
char_u dirname[MAXPATHL];
|
||||
int c;
|
||||
int has_fullname = 0;
|
||||
#ifdef WIN3264
|
||||
#ifdef MSWIN
|
||||
char_u *fname_start = *fnamep;
|
||||
int has_shortname = 0;
|
||||
#endif
|
||||
@@ -10270,7 +10270,7 @@ repeat:
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifdef WIN3264
|
||||
#ifdef MSWIN
|
||||
# if _WIN32_WINNT >= 0x0500
|
||||
if (vim_strchr(*fnamep, '~') != NULL)
|
||||
{
|
||||
@@ -10313,7 +10313,7 @@ repeat:
|
||||
*usedlen += 2;
|
||||
if (c == '8')
|
||||
{
|
||||
#ifdef WIN3264
|
||||
#ifdef MSWIN
|
||||
has_shortname = 1; /* Postpone this. */
|
||||
#endif
|
||||
continue;
|
||||
@@ -10406,12 +10406,12 @@ repeat:
|
||||
if (src[*usedlen] == ':' && src[*usedlen + 1] == '8')
|
||||
{
|
||||
*usedlen += 2;
|
||||
#ifdef WIN3264
|
||||
#ifdef MSWIN
|
||||
has_shortname = 1;
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef WIN3264
|
||||
#ifdef MSWIN
|
||||
/*
|
||||
* Handle ":8" after we have done 'heads' and before we do 'tails'.
|
||||
*/
|
||||
@@ -10455,7 +10455,7 @@ repeat:
|
||||
*fnamelen = l;
|
||||
}
|
||||
}
|
||||
#endif /* WIN3264 */
|
||||
#endif // MSWIN
|
||||
|
||||
/* ":t" - tail, just the basename */
|
||||
if (src[*usedlen] == ':' && src[*usedlen + 1] == 't')
|
||||
|
Reference in New Issue
Block a user