Merge branch 'obsd-master'

Conflicts:
	format.c
	osdep-openbsd.c
This commit is contained in:
Thomas Adam
2016-10-12 09:45:49 +01:00
98 changed files with 2110 additions and 2229 deletions

View File

@@ -26,8 +26,9 @@
#include "tmux.h"
struct session *server_next_session(struct session *);
void server_callback_identify(int, short, void *);
static struct session *server_next_session(struct session *);
static void server_callback_identify(int, short, void *);
static void server_destroy_session_group(struct session *);
void
server_fill_environ(struct session *s, struct environ *env)
@@ -340,7 +341,7 @@ server_destroy_pane(struct window_pane *wp, int hooks)
server_redraw_window(w);
}
void
static void
server_destroy_session_group(struct session *s)
{
struct session_group *sg;
@@ -356,7 +357,7 @@ server_destroy_session_group(struct session *s)
}
}
struct session *
static struct session *
server_next_session(struct session *s)
{
struct session *s_loop, *s_out;
@@ -455,7 +456,7 @@ server_clear_identify(struct client *c, struct window_pane *wp)
server_redraw_client(c);
}
void
static void
server_callback_identify(__unused int fd, __unused short events, void *data)
{
server_clear_identify(data, NULL);