summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-04-28 21:58:29 +0200
committerBram Moolenaar <Bram@vim.org>2020-04-28 21:58:29 +0200
commitaffc8fd2cda77fbd47df2594da417a9f9a9bb9b6 (patch)
treefe21aac3df88901e6b9268bb1db05ddd47004741
parenta0a9f43ab24928a0b01b6d91d084bf50a6dbefc2 (diff)
patch 8.2.0658: HP-UX build fails when setenv() is not definedv8.2.0658
Problem: HP-UX build fails when setenv() is not defined. Solution: Change "colors" to "t_colors". (John Marriott)
-rw-r--r--src/os_unix.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 66903e0819..f8fe2cb64b 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4196,7 +4196,7 @@ set_child_environment(
vim_snprintf(envbuf_Columns, sizeof(envbuf_Columns),
"COLUMNS=%ld", columns);
putenv(envbuf_Columns);
- vim_snprintf(envbuf_Colors, sizeof(envbuf_Colors), "COLORS=%ld", colors);
+ vim_snprintf(envbuf_Colors, sizeof(envbuf_Colors), "COLORS=%ld", t_colors);
putenv(envbuf_Colors);
# ifdef FEAT_TERMINAL
if (is_terminal)
diff --git a/src/version.c b/src/version.c
index eac5c9adfa..127f906291 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 658,
+/**/
657,
/**/
656,