To: vim_dev@googlegroups.com
Subject: Patch 8.2.3445
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.3445
Problem:    On Solaris longVersion may be declared twice. (Vladimir Marek)
Solution:   Always declare longVersion in version.c
Files:      src/globals.h, src/version.c


*** ../vim-8.2.3444/src/globals.h	2021-09-12 13:39:04.323467415 +0200
--- src/globals.h	2021-09-17 20:40:04.255435018 +0200
***************
*** 1333,1339 ****
  #if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC)
  extern char longVersion[];
  #else
! EXTERN char *longVersion INIT(= NULL);
  #endif
  
  /*
--- 1333,1339 ----
  #if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC)
  extern char longVersion[];
  #else
! extern char *longVersion;
  #endif
  
  /*
*** ../vim-8.2.3444/src/version.c	2021-09-16 22:31:48.023014473 +0200
--- src/version.c	2021-09-17 20:44:50.962900264 +0200
***************
*** 51,56 ****
--- 51,58 ----
  }
  
  # else
+ char	*longVersion = NULL;
+ 
      void
  init_longVersion(void)
  {
***************
*** 72,78 ****
  	    longVersion = VIM_VERSION_LONG;
  	else
  	    vim_snprintf(longVersion, len, msg,
! 			  VIM_VERSION_LONG_ONLY, VIM_VERSION_DATE_ONLY, date_time);
      }
  }
  # endif
--- 74,80 ----
  	    longVersion = VIM_VERSION_LONG;
  	else
  	    vim_snprintf(longVersion, len, msg,
! 		      VIM_VERSION_LONG_ONLY, VIM_VERSION_DATE_ONLY, date_time);
      }
  }
  # endif
*** ../vim-8.2.3444/src/version.c	2021-09-16 22:31:48.023014473 +0200
--- src/version.c	2021-09-17 20:44:50.962900264 +0200
***************
*** 757,758 ****
--- 759,762 ----
  {   /* Add new patch number below this line */
+ /**/
+     3445,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
31. You code your homework in HTML and give your instructor the URL.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///