Merge branch 'obsd-master'

pull/3573/head
Thomas Adam 2023-05-08 12:01:09 +01:00
commit 149d9cc851
2 changed files with 2 additions and 2 deletions

2
grid.c
View File

@ -53,7 +53,7 @@ static const struct grid_cell grid_cleared_cell = {
{ { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 0, 0
};
static const struct grid_cell_entry grid_cleared_entry = {
GRID_FLAG_CLEARED, { .data = { 0, 8, 8, ' ' } }
{ .data = { 0, 8, 8, ' ' } }, GRID_FLAG_CLEARED
};
/* Store cell in entry. */

2
tmux.h
View File

@ -727,7 +727,6 @@ struct grid_extd_entry {
/* Grid cell entry. */
struct grid_cell_entry {
u_char flags;
union {
u_int offset;
struct {
@ -737,6 +736,7 @@ struct grid_cell_entry {
u_char data;
} data;
};
u_char flags;
} __packed;
/* Grid line. */