aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 8.2.3445: on Solaris longVersion may be declared twice

Browse Source 
Problem:    On Solaris longVersion may be declared twice. (Vladimir Marek)
Solution:   Always declare longVersion in version.c
This commit is contained in:
Bram Moolenaar
2021-09-17 20:45:30 +02:00
parent 644b49fa0f
commit 542ffe16a1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/globals.h
View File

@@ -1333,7 +1333,7 @@ extern char *Version;
#if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC) #if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC)
extern char longVersion[]; extern char longVersion[];
#else #else
EXTERN char *longVersion INIT(= NULL); extern char *longVersion;
#endif #endif
/* /*

6
src/version.c
View File

@@ -51,6 +51,8 @@ init_longVersion(void)
} }
# else # else
char *longVersion = NULL;
void void
init_longVersion(void) init_longVersion(void)
{ {
@@ -72,7 +74,7 @@ init_longVersion(void)
longVersion = VIM_VERSION_LONG; longVersion = VIM_VERSION_LONG;
else else
vim_snprintf(longVersion, len, msg, 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 # endif
@@ -755,6 +757,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3445,
/**/ /**/
3444, 3444,
/**/ /**/