diff --git a/src/ex_getln.c b/src/ex_getln.c index 2475bb9c12dd2b9fb2b0a2bd67038acdd18f1c4c..d2925535e484a570d1a691b1e1168da3415602d1 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -5040,7 +5040,7 @@ globpath(path, file, expand_options) copy_option_part(&path, buf, MAXPATHL, ","); if (STRLEN(buf) + STRLEN(file) + 2 < MAXPATHL) { -# ifdef WIN3264 +# if defined(MSWIN) || defined(MSDOS) /* Using the platform's path separator (\) makes vim incorrectly * treat it as an escape character, use '/' instead. */ if (*buf != NUL && !after_pathsep(buf, buf + STRLEN(buf))) diff --git a/src/misc1.c b/src/misc1.c index 911ba4a217b24ad2924fad26050eefb8e3401cf6..fd4e4fe669700ec9c859de76d3470c1138a032ea 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -9374,7 +9374,7 @@ get_path_cutoff(fname, gap) int j = 0; while ((fname[j] == path_part[i][j] -#if defined(WIN3264) +# if defined(MSWIN) || defined(MSDOS) || (vim_ispathsep(fname[j]) && vim_ispathsep(path_part[i][j])) #endif ) && fname[j] != NUL && path_part[i][j] != NUL) @@ -9389,7 +9389,7 @@ get_path_cutoff(fname, gap) /* Skip to the file or directory name */ if (cutoff != NULL) while ( -#if defined(WIN3264) +# if defined(MSWIN) || defined(MSDOS) *cutoff == '/' #else vim_ispathsep(*cutoff) @@ -9460,7 +9460,7 @@ uniquefy_paths(gap, pattern) len = (int)STRLEN(path); while (dir_end > path && -#if defined(WIN3264) +# if defined(MSWIN) || defined(MSDOS) *dir_end != '/' #else !vim_ispathsep(*dir_end)