Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-11-02 20:01:26 +00:00
7 changed files with 66 additions and 15 deletions

View File

@ -38,10 +38,6 @@ static struct winlink *session_next_alert(struct winlink *);
static struct winlink *session_previous_alert(struct winlink *);
static void session_group_remove(struct session *);
static u_int session_group_count(struct session_group *);
static void session_group_synchronize1(struct session *, struct session *);
static u_int session_group_count(struct session_group *);
static void session_group_synchronize1(struct session *, struct session *);
RB_GENERATE(sessions, session, entry, session_cmp);
@ -623,7 +619,7 @@ session_group_remove(struct session *s)
}
/* Count number of sessions in session group. */
static u_int
u_int
session_group_count(struct session_group *sg)
{
struct session *s;