diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-01 18:44:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-01 18:44:29 +0200 |
| commit | 2a4f06f370df0eb6fb77a05343604f5124ae5a11 (patch) | |
| tree | e5b0c5d8851cae191f5f1e50bf61cb56e0506ce1 | |
| parent | 9c8448472fe686f10c4aaf69bcf0fafbbd19abc2 (diff) | |
| download | vim-git-2a4f06f370df0eb6fb77a05343604f5124ae5a11.tar.gz | |
patch 8.0.0834: can't build without the client-server featurev8.0.0834
Problem: Can't build without the client-server feature.
Solution: Add #ifdef.
| -rw-r--r-- | src/os_unix.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 668b930a1..c7c4367bd 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -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 } diff --git a/src/version.c b/src/version.c index 4a77bddf3..539fca2a1 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 834, +/**/ 833, /**/ 832, |