Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-01-13 14:01:13 +00:00
9 changed files with 31 additions and 29 deletions

View File

@ -33,9 +33,9 @@ static void server_destroy_session_group(struct session *);
void
server_fill_environ(struct session *s, struct environ *env)
{
char *term;
u_int idx;
long pid;
const char *term;
u_int idx;
long pid;
if (s != NULL) {
term = options_get_string(global_options, "default-terminal");