Skip to content

Commit 2a4f06f

Browse files
committed
patch 8.0.0834: can't build without the client-server feature
Problem: Can't build without the client-server feature. Solution: Add #ifdef.
1 parent 9c84484 commit 2a4f06f

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

src/os_unix.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4108,7 +4108,9 @@ set_child_environment(long rows, long columns, char *term)
41084108
static char envbuf_Lines[20];
41094109
static char envbuf_Columns[20];
41104110
static char envbuf_Colors[20];
4111+
# ifdef FEAT_CLIENTSERVER
41114112
static char envbuf_Servername[60];
4113+
# endif
41124114
# endif
41134115
long colors =
41144116
# ifdef FEAT_GUI
@@ -4126,7 +4128,9 @@ set_child_environment(long rows, long columns, char *term)
41264128
setenv("COLUMNS", (char *)envbuf, 1);
41274129
sprintf((char *)envbuf, "%ld", colors);
41284130
setenv("COLORS", (char *)envbuf, 1);
4131+
# ifdef FEAT_CLIENTSERVER
41294132
setenv("VIM_SERVERNAME", serverName == NULL ? "" : (char *)serverName, 1);
4133+
# endif
41304134
# else
41314135
/*
41324136
* Putenv does not copy the string, it has to remain valid.
@@ -4144,9 +4148,11 @@ set_child_environment(long rows, long columns, char *term)
41444148
putenv(envbuf_Columns);
41454149
vim_snprintf(envbuf_Colors, sizeof(envbuf_Colors), "COLORS=%ld", colors);
41464150
putenv(envbuf_Colors);
4151+
# ifdef FEAT_CLIENTSERVER
41474152
vim_snprintf(envbuf_Servername, sizeof(envbuf_Servername),
41484153
"VIM_SERVERNAME=%s", serverName == NULL ? "" : (char *)serverName);
41494154
putenv(envbuf_Servername);
4155+
# endif
41504156
# endif
41514157
}
41524158

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,8 @@ static char *(features[]) =
769769

770770
static int included_patches[] =
771771
{ /* Add new patch number below this line */
772+
/**/
773+
834,
772774
/**/
773775
833,
774776
/**/

0 commit comments

Comments
 (0)