diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_unix.c | 10 | ||||
| -rw-r--r-- | src/spellfile.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 32850f3bf2..1c00f22793 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -3376,7 +3376,15 @@ exit_scroll(void) } #ifdef USE_GCOV_FLUSH -extern void __gcov_flush(); +# if (defined(__GNUC__) \ + && ((__GNUC__ == 11 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 12))) \ + || (defined(__clang__) && (__clang_major__ >= 12)) +extern void __gcov_dump(void); +extern void __gcov_reset(void); +# define __gcov_flush() do { __gcov_dump(); __gcov_reset(); } while (0) +# else +extern void __gcov_flush(void); +# endif #endif void diff --git a/src/spellfile.c b/src/spellfile.c index 6d6c248ab0..46d222d9b7 100644 --- a/src/spellfile.c +++ b/src/spellfile.c @@ -6576,7 +6576,7 @@ write_spell_prefcond(FILE *fd, garray_T *gap) char_u *p; int len; int totlen; - size_t x = 1; // collect return value of fwrite() + size_t x UNUSED = 1; // collect return value of fwrite() if (fd != NULL) put_bytes(fd, (long_u)gap->ga_len, 2); // <prefcondcnt> diff --git a/src/version.c b/src/version.c index 5aa6ce73e0..5db7dca5d8 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3770, +/**/ 3769, /**/ 3768, |