diff options
| author | =?UTF-8?q?Ola=20S=C3=B6der?= <rolfkopman@gmail.com> | 2021-07-06 20:15:46 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-06 20:15:46 +0200 |
| commit | 599a6e5b3629d943a795cd69e4d3d19886f86405 (patch) | |
| tree | aef017bc4dca896de74d15df6a63a025bcd8ee4a | |
| parent | 442b29c968eff1c8fec1a96418aa47be9cba62ea (diff) | |
patch 8.2.3114: Amiga-like systems: build error using stat()v8.2.3114
Problem: Amiga-like systems: build error using stat().
Solution: Only build swapfile_process_running() on systems where it is
actually used. (Ola Söder, closes #8519)
| -rw-r--r-- | src/memline.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/memline.c b/src/memline.c index 0eac1cdcb1..c2e1074248 100644 --- a/src/memline.c +++ b/src/memline.c @@ -1104,6 +1104,7 @@ add_b0_fenc( # include <sys/sysinfo.h> #endif +#if defined(UNIX) || defined(MSWIN) /* * Return TRUE if the process with number "b0p->b0_pid" is still running. * "swap_fname" is the name of the swap file, if it's from before a reboot then @@ -1112,7 +1113,7 @@ add_b0_fenc( static int swapfile_process_running(ZERO_BL *b0p, char_u *swap_fname UNUSED) { -#ifdef HAVE_SYSINFO_UPTIME +# ifdef HAVE_SYSINFO_UPTIME stat_T st; struct sysinfo sinfo; @@ -1121,14 +1122,15 @@ swapfile_process_running(ZERO_BL *b0p, char_u *swap_fname UNUSED) if (mch_stat((char *)swap_fname, &st) != -1 && sysinfo(&sinfo) == 0 && st.st_mtime < time(NULL) - ( -# ifdef FEAT_EVAL +# ifdef FEAT_EVAL override_sysinfo_uptime >= 0 ? override_sysinfo_uptime : -# endif +# endif sinfo.uptime)) return FALSE; -#endif +# endif return mch_process_running(char_to_long(b0p->b0_pid)); } +#endif /* * Try to recover curbuf from the .swp file. diff --git a/src/version.c b/src/version.c index b0d8dae3f5..7dfbe6dd8f 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3114, +/**/ 3113, /**/ 3112, |