Merge branch 'obsd-master'

1 files changed, 3 insertions, 3 deletions

diff --git a/tmux.h b/tmux.h
index f09200ed..edc6de1f 100644
--- a/tmux.h
+++ b/tmux.h
@@ -598,13 +598,13 @@ enum utf8_state {
 
 /* Grid cell data. */
 struct grid_cell {
-	u_char			flags;
+	struct utf8_data	data; /* 21 bytes */
 	u_short			attr;
+	u_char			flags;
 	int			fg;
 	int			bg;
 	int			us;
-	struct utf8_data	data;
-};
+} __packed;
 struct grid_cell_entry {
 	u_char			flags;
 	union {