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.

diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 03853e7..6017f6f 100644 (file)
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.1156 2021/12/10 12:42:37 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.1157 2021/12/21 13:07:53 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -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 {