From 778aafb503bcac4629c6b8a0b4cefa4f4faff59e Mon Sep 17 00:00:00 2001
From: Jacob Hageman <jacob.hageman@nasa.gov>
Date: Thu, 7 Jan 2021 17:34:12 -0500
Subject: [PATCH] Fix #488, Pad msg headers to 64 bit

---
 modules/msg/mission_inc/default_cfe_msg_hdr_pri.h    | 1 +
 modules/msg/mission_inc/default_cfe_msg_hdr_priext.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/msg/mission_inc/default_cfe_msg_hdr_pri.h b/modules/msg/mission_inc/default_cfe_msg_hdr_pri.h
index 0e8558d5d..4ff9880bf 100644
--- a/modules/msg/mission_inc/default_cfe_msg_hdr_pri.h
+++ b/modules/msg/mission_inc/default_cfe_msg_hdr_pri.h
@@ -82,6 +82,7 @@ typedef struct
 
     CFE_MSG_Message_t                  Msg; /**< \brief Base message */
     CFE_MSG_TelemetrySecondaryHeader_t Sec; /**< \brief Secondary header */
+    uint8                              Spare[4]; /**< \brief Padding to end on 64 bit boundary */
 
 } CFE_MSG_TelemetryHeader_t;
 
diff --git a/modules/msg/mission_inc/default_cfe_msg_hdr_priext.h b/modules/msg/mission_inc/default_cfe_msg_hdr_priext.h
index aa401bd8b..36d9dccbe 100644
--- a/modules/msg/mission_inc/default_cfe_msg_hdr_priext.h
+++ b/modules/msg/mission_inc/default_cfe_msg_hdr_priext.h
@@ -72,6 +72,7 @@ typedef struct
 
     CFE_MSG_Message_t                Msg; /**< \brief Base message */
     CFE_MSG_CommandSecondaryHeader_t Sec; /**< \brief Secondary header */
+    uint8                            Spare[4]; /**< /brief Padding to end on 64 bit boundary */
 
 } CFE_MSG_CommandHeader_t;