diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-09-17 20:45:30 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-09-17 20:45:30 +0200 |
| commit | 542ffe16a1b6961e9262a3c4c6ddb86e6149a1cd (patch) | |
| tree | 65c5bec60b6ba705a9de956b54a1403e5a651fd2 | |
| parent | 644b49fa0fb90143e8dbe90a7c14c9498d17b266 (diff) | |
| download | vim-git-542ffe16a1b6961e9262a3c4c6ddb86e6149a1cd.tar.gz | |
patch 8.2.3445: on Solaris longVersion may be declared twicev8.2.3445
Problem: On Solaris longVersion may be declared twice. (Vladimir Marek)
Solution: Always declare longVersion in version.c
| -rw-r--r-- | src/globals.h | 2 | ||||
| -rw-r--r-- | src/version.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/globals.h b/src/globals.h index 1cbcf5c56..4a6e02748 100644 --- 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 /* diff --git a/src/version.c b/src/version.c index 0b714bf46..6c2e4d1ab 100644 --- 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, |