diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-23 14:53:34 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-23 14:53:34 +0100 |
| commit | 48e330aff911be1c798c88a973af6437a8141fce (patch) | |
| tree | 4945b46753c6220ae5e8cd406d139e5640bd39c4 /src/diff.c | |
| parent | 4e221c99e85ed40c98892068a01270b9e7492d98 (diff) | |
| download | vim-git-48e330aff911be1c798c88a973af6437a8141fce.tar.gz | |
patch 7.4.1399v7.4.1399
Problem: The MS-DOS code does not build.
Solution: Remove the old MS-DOS code.
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/diff.c b/src/diff.c index db1d066f9..be7e38ccb 100644 --- a/src/diff.c +++ b/src/diff.c @@ -29,7 +29,7 @@ static int diff_flags = DIFF_FILLER; static int diff_a_works = MAYBE; /* TRUE when "diff -a" works, FALSE when it doesn't work, MAYBE when not checked yet */ -#if defined(MSWIN) || defined(MSDOS) +#if defined(MSWIN) static int diff_bin_works = MAYBE; /* TRUE when "diff --binary" works, FALSE when it doesn't work, MAYBE when not checked yet */ @@ -733,7 +733,7 @@ ex_diffupdate( break; #endif -#if defined(MSWIN) || defined(MSDOS) +#if defined(MSWIN) /* If the "-a" argument works, also check if "--binary" works. */ if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE) { @@ -764,7 +764,7 @@ ex_diffupdate( EMSG(_("E810: Cannot read or write temp files")); EMSG(_("E97: Cannot create diffs")); diff_a_works = MAYBE; -#if defined(MSWIN) || defined(MSDOS) +#if defined(MSWIN) diff_bin_works = MAYBE; #endif goto theend; @@ -845,7 +845,7 @@ diff_file( * non-zero when differences have been found. */ vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s %s", diff_a_works == FALSE ? "" : "-a ", -#if defined(MSWIN) || defined(MSDOS) +#if defined(MSWIN) diff_bin_works == TRUE ? "--binary " : "", #else "", |