commit 542ffe16a1b6961e9262a3c4c6ddb86e6149a1cd
author Bram Moolenaar <Bram@vim.org> Fri Sep 17 20:45:30 2021 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Sep 17 20:45:30 2021 +0200
tree 65c5bec60b6ba705a9de956b54a1403e5a651fd2
parent 644b49fa0fb90143e8dbe90a7c14c9498d17b266

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

src/globals.h

diff --git a/src/globals.h b/src/globals.h
index 1cbcf5c..4a6e027 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1333,7 +1333,7 @@
 #if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC)
 extern char longVersion[];
 #else
-EXTERN char *longVersion INIT(= NULL);
+extern char *longVersion;
 #endif
 
 /*

src/version.c

diff --git a/src/version.c b/src/version.c
index 0b714bf..6c2e4d1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -51,6 +51,8 @@
 }
 
 # else
+char	*longVersion = NULL;
+
     void
 init_longVersion(void)
 {
@@ -72,7 +74,7 @@
 	    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 int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3445,
+/**/
     3444,
 /**/
     3443,