From 204d8f31d7fc003e41622e21a9303dc017ad14fa Mon Sep 17 00:00:00 2001
From: tb <tb>
Date: Mon, 8 May 2023 10:03:39 +0000
Subject: [PATCH] Reorder struct grid_cell_entry

On aarch64 with llvm 15, the new -Wunaligned-access emits noise on every
one of tmux's source files. This avoids this warning by moving a u_char
to the end of the struct. This does not change the size of the struct on
any architecture.

ok nicm
---
 grid.c | 2 +-
 tmux.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/grid.c b/grid.c
index 58de03a3..3afbfb6a 100644
--- a/grid.c
+++ b/grid.c
@@ -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. */
diff --git a/tmux.h b/tmux.h
index 11d8b26c..b43a2af0 100644
--- a/tmux.h
+++ b/tmux.h
@@ -723,7 +723,6 @@ struct grid_extd_entry {
 
 /* Grid cell entry. */
 struct grid_cell_entry {
-	u_char			flags;
 	union {
 		u_int		offset;
 		struct {
@@ -733,6 +732,7 @@ struct grid_cell_entry {
 			u_char	data;
 		} data;
 	};
+	u_char			flags;
 } __packed;
 
 /* Grid line. */