Mercurial > vim
changeset 25820:5d89ca7d28ac v8.2.3445
patch 8.2.3445: on Solaris longVersion may be declared twice
Commit: https://github.com/vim/vim/commit/542ffe16a1b6961e9262a3c4c6ddb86e6149a1cd
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Sep 17 20:45:30 2021 +0200
patch 8.2.3445: on Solaris longVersion may be declared twice
Problem: On Solaris longVersion may be declared twice. (Vladimir Marek)
Solution: Always declare longVersion in version.c
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 17 Sep 2021 21:00:05 +0200 |
| parents | bc8e47583135 |
| children | ef98a99ef1ae |
| files | src/globals.h src/version.c |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/globals.h +++ b/src/globals.h @@ -1333,7 +1333,7 @@ extern char *Version; #if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC) extern char longVersion[]; #else -EXTERN char *longVersion INIT(= NULL); +extern char *longVersion; #endif /*
--- a/src/version.c +++ b/src/version.c @@ -51,6 +51,8 @@ init_longVersion(void) } # else +char *longVersion = NULL; + void init_longVersion(void) { @@ -72,7 +74,7 @@ init_longVersion(void) longVersion = VIM_VERSION_LONG; else vim_snprintf(longVersion, len, msg, - VIM_VERSION_LONG_ONLY, VIM_VERSION_DATE_ONLY, date_time); + VIM_VERSION_LONG_ONLY, VIM_VERSION_DATE_ONLY, date_time); } } # endif @@ -756,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3445, +/**/ 3444, /**/ 3443,