From ff64aafeabe0c9b51b33a10313e2027ae1686bc4 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 21 Dec 2021 13:07:53 +0000
Subject: [PATCH] ARM's Morello CHERI architecture does not support pointers in
 packed structures, so remove the packed attribute on struct grid_line and
 reorder the members to eliminate unnecessary padding. From Jessica Clarke in
 GitHub issue 3012.

---
 tmux.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tmux.h b/tmux.h
index e6a33104..4f8016d3 100644
--- a/tmux.h
+++ b/tmux.h
@@ -668,15 +668,15 @@ struct grid_cell_entry {
 
 /* Grid line. */
 struct grid_line {
+	struct grid_cell_entry	*celldata;
 	u_int			 cellused;
 	u_int			 cellsize;
-	struct grid_cell_entry	*celldata;
 
-	u_int			 extdsize;
 	struct grid_extd_entry	*extddata;
+	u_int			 extdsize;
 
 	int			 flags;
-} __packed;
+};
 
 /* Entire grid of cells. */
 struct grid {