Merge branch 'obsd-master'

pull/501/merge
Thomas Adam 2017-02-22 10:01:12 +00:00
commit 14dc2acc25
3 changed files with 3 additions and 2 deletions

2
grid.c
View File

@ -39,7 +39,7 @@
const struct grid_cell grid_default_cell = {
0, 0, 8, 8, { { ' ' }, 0, 1, 1 }
};
const struct grid_cell_entry grid_default_entry = {
static const struct grid_cell_entry grid_default_entry = {
0, { .data = { 0, 8, 8, ' ' } }
};

View File

@ -232,7 +232,7 @@ key_string_lookup_string(const char *string)
const char *
key_string_lookup_key(key_code key)
{
static char out[24];
static char out[32];
char tmp[8];
u_int i;
struct utf8_data ud;

View File

@ -1506,6 +1506,7 @@ winlink_clear_flags(struct winlink *wl)
}
}
/* Shuffle window indexes up. */
int
winlink_shuffle_up(struct session *s, struct winlink *wl)
{