diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-03-10 21:55:46 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-03-10 21:55:46 +0100 |
| commit | 23b32a8d6bd9ec83c0c6632b7a8bfa544ac0a2f1 (patch) | |
| tree | ff8388053b9d7782f2d7dbaf01921aef2a59591a | |
| parent | 6635ae1437e6e343c0514524a8dfb19d9525b908 (diff) | |
patch 8.2.2588: build failure with tiny featuresv8.2.2588
Problem: Build failure with tiny features.
Solution: Add #ifdef. Run recover test separately.
| -rw-r--r-- | src/memline.c | 7 | ||||
| -rw-r--r-- | src/testdir/Make_all.mak | 1 | ||||
| -rw-r--r-- | src/testdir/test_alot.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/src/memline.c b/src/memline.c index 4da7b431fc..4c4a1b24cb 100644 --- a/src/memline.c +++ b/src/memline.c @@ -1100,8 +1100,11 @@ swapfile_process_running(ZERO_BL *b0p, char_u *swap_fname UNUSED) // process can't be running now. if (mch_stat((char *)swap_fname, &st) != -1 && sysinfo(&sinfo) == 0 - && st.st_mtime < time(NULL) - (override_sysinfo_uptime >= 0 - ? override_sysinfo_uptime : sinfo.uptime)) + && st.st_mtime < time(NULL) - ( +# ifdef FEAT_EVAL + override_sysinfo_uptime >= 0 ? override_sysinfo_uptime : +# endif + sinfo.uptime)) return FALSE; #endif return mch_process_running(char_to_long(b0p->b0_pid)); diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index b769499328..108c52854d 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -459,6 +459,7 @@ NEW_TESTS_RES = \ test_quickfix.res \ test_quotestar.res \ test_random.res \ + test_recover.res \ test_regex_char_classes.res \ test_registers.res \ test_rename.res \ diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim index 83f2c1923c..f54e6f2c50 100644 --- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -21,7 +21,6 @@ source test_jumps.vim source test_lispwords.vim source test_move.vim source test_put.vim -source test_recover.vim source test_reltime.vim source test_scroll_opt.vim source test_searchpos.vim diff --git a/src/version.c b/src/version.c index df8d2f917b..4d693c45f0 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2588, +/**/ 2587, /**/ 2586, |