aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

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

Browse Source 
Problem:    Can't build without the client-server feature.
Solution:   Add #ifdef.
This commit is contained in:
Bram Moolenaar
2017-08-01 18:44:29 +02:00
parent 9c8448472f
commit 2a4f06f370
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/os_unix.c
View File

@@ -4108,7 +4108,9 @@ set_child_environment(long rows, long columns, char *term)
static char envbuf_Lines[20]; static char envbuf_Lines[20];
static char envbuf_Columns[20]; static char envbuf_Columns[20];
static char envbuf_Colors[20]; static char envbuf_Colors[20];
# ifdef FEAT_CLIENTSERVER
static char envbuf_Servername[60]; static char envbuf_Servername[60];
# endif
# endif # endif
long colors = long colors =
# ifdef FEAT_GUI # ifdef FEAT_GUI
@@ -4126,7 +4128,9 @@ set_child_environment(long rows, long columns, char *term)
setenv("COLUMNS", (char *)envbuf, 1); setenv("COLUMNS", (char *)envbuf, 1);
sprintf((char *)envbuf, "%ld", colors); sprintf((char *)envbuf, "%ld", colors);
setenv("COLORS", (char *)envbuf, 1); setenv("COLORS", (char *)envbuf, 1);
# ifdef FEAT_CLIENTSERVER
setenv("VIM_SERVERNAME", serverName == NULL ? "" : (char *)serverName, 1); setenv("VIM_SERVERNAME", serverName == NULL ? "" : (char *)serverName, 1);
# endif
# else # else
/* /*
* Putenv does not copy the string, it has to remain valid. * 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); putenv(envbuf_Columns);
vim_snprintf(envbuf_Colors, sizeof(envbuf_Colors), "COLORS=%ld", colors); vim_snprintf(envbuf_Colors, sizeof(envbuf_Colors), "COLORS=%ld", colors);
putenv(envbuf_Colors); putenv(envbuf_Colors);
# ifdef FEAT_CLIENTSERVER
vim_snprintf(envbuf_Servername, sizeof(envbuf_Servername), vim_snprintf(envbuf_Servername, sizeof(envbuf_Servername),
"VIM_SERVERNAME=%s", serverName == NULL ? "" : (char *)serverName); "VIM_SERVERNAME=%s", serverName == NULL ? "" : (char *)serverName);
putenv(envbuf_Servername); putenv(envbuf_Servername);
# endif
# endif # endif
} }

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
834,
/**/ /**/
833, 833,
/**/ /**/