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

diff --git a/src/globals.h b/src/globals.h
index 1cbcf5c568f1980c222515e6d2cc191f1be89c1f..4a6e02748646536dcacae7406f55b71bb4c266cc 100644 (file)
--- 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 0b714bf46f23794649332f68b06386a503896f77..6c2e4d1ab6dd5e4fdab9648a93961ded0e05f605 100644 (file)
--- 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
@@ -755,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3445,
 /**/
     3444,
 /**/