Skip to content

Commit 542ffe1

Browse files
committed
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
1 parent 644b49f commit 542ffe1

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/globals.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ extern char *Version;
13331333
#if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC)
13341334
extern char longVersion[];
13351335
#else
1336-
EXTERN char *longVersion INIT(= NULL);
1336+
extern char *longVersion;
13371337
#endif
13381338

13391339
/*

src/version.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ init_longVersion(void)
5151
}
5252

5353
# else
54+
char *longVersion = NULL;
55+
5456
void
5557
init_longVersion(void)
5658
{
@@ -72,7 +74,7 @@ init_longVersion(void)
7274
longVersion = VIM_VERSION_LONG;
7375
else
7476
vim_snprintf(longVersion, len, msg,
75-
VIM_VERSION_LONG_ONLY, VIM_VERSION_DATE_ONLY, date_time);
77+
VIM_VERSION_LONG_ONLY, VIM_VERSION_DATE_ONLY, date_time);
7678
}
7779
}
7880
# endif
@@ -755,6 +757,8 @@ static char *(features[]) =
755757

756758
static int included_patches[] =
757759
{ /* Add new patch number below this line */
760+
/**/
761+
3445,
758762
/**/
759763
3444,
760764
/**/

0 commit comments

Comments
 (0)