Permalink
Browse files

patch 8.0.0834: can't build without the client-server feature

Problem:    Can't build without the client-server feature.
Solution:   Add #ifdef.
  • Loading branch information...
brammool committed Aug 1, 2017
1 parent 9c84484 commit 2a4f06f370df0eb6fb77a05343604f5124ae5a11
Showing with 8 additions and 0 deletions.
  1. +6 −0 src/os_unix.c
  2. +2 −0 src/version.c
View
@@ -4108,7 +4108,9 @@ set_child_environment(long rows, long columns, char *term)
static char envbuf_Lines[20];
static char envbuf_Columns[20];
static char envbuf_Colors[20];
# ifdef FEAT_CLIENTSERVER
static char envbuf_Servername[60];
# endif
# endif
long colors =
# ifdef FEAT_GUI
@@ -4126,7 +4128,9 @@ set_child_environment(long rows, long columns, char *term)
setenv("COLUMNS", (char *)envbuf, 1);
sprintf((char *)envbuf, "%ld", colors);
setenv("COLORS", (char *)envbuf, 1);
# ifdef FEAT_CLIENTSERVER
setenv("VIM_SERVERNAME", serverName == NULL ? "" : (char *)serverName, 1);
# endif
# else
/*
* Putenv does not copy the string, it has to remain valid.
@@ -4144,9 +4148,11 @@ set_child_environment(long rows, long columns, char *term)
putenv(envbuf_Columns);
vim_snprintf(envbuf_Colors, sizeof(envbuf_Colors), "COLORS=%ld", colors);
putenv(envbuf_Colors);
# ifdef FEAT_CLIENTSERVER
vim_snprintf(envbuf_Servername, sizeof(envbuf_Servername),
"VIM_SERVERNAME=%s", serverName == NULL ? "" : (char *)serverName);
putenv(envbuf_Servername);
# endif
# endif
}
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
834,
/**/
833,
/**/

0 comments on commit 2a4f06f

Please sign in to comment.