Mercurial > vim

comparison src/version.c @ 25820:5d89ca7d28ac v8.2.3445

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3445: on Solaris longVersion may be declared twice Commit: https://github.com/vim/vim/commit/542ffe16a1b6961e9262a3c4c6ddb86e6149a1cd Author: Bram Moolenaar <Bram@vim.org> Date: Fri Sep 17 20:45:30 2021 +0200 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
author Bram Moolenaar <Bram@vim.org>
date Fri, 17 Sep 2021 21:00:05 +0200
parents 37bc83bbda91
children 42723b535ab3
comparison
equal deleted inserted replaced
25819:bc8e47583135 25820:5d89ca7d28ac
49 #endif 49 #endif
50 strcat(longVersion, ")"); 50 strcat(longVersion, ")");
51 } 51 }
52 52
53 # else 53 # else
54 char *longVersion = NULL;
55
54 void 56 void
55 init_longVersion(void) 57 init_longVersion(void)
56 { 58 {
57 if (longVersion == NULL) 59 if (longVersion == NULL)
58 { 60 {
70 longVersion = alloc(len); 72 longVersion = alloc(len);
71 if (longVersion == NULL) 73 if (longVersion == NULL)
72 longVersion = VIM_VERSION_LONG; 74 longVersion = VIM_VERSION_LONG;
73 else 75 else
74 vim_snprintf(longVersion, len, msg, 76 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);
76 } 78 }
77 } 79 }
78 # endif 80 # endif
79 #else 81 #else
80 char *longVersion = VIM_VERSION_LONG; 82 char *longVersion = VIM_VERSION_LONG;
753 NULL 755 NULL
754 }; 756 };
755 757
756 static int included_patches[] = 758 static int included_patches[] =
757 { /* Add new patch number below this line */ 759 { /* Add new patch number below this line */
760 /**/
761 3445,
758 /**/ 762 /**/
759 3444, 763 3444,
760 /**/ 764 /**/
761 3443, 765 3443,
762 /**/ 766 /**/