From 582ea3bfd0150fc837d475f4704b7d1bbd450aa7 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Mon, 24 Aug 2020 18:10:18 -0400 Subject: [PATCH] HOTFIX: Deprecated time format verify logic fix --- fsw/cfe-core/src/sb/cfe_sb_verify.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fsw/cfe-core/src/sb/cfe_sb_verify.h b/fsw/cfe-core/src/sb/cfe_sb_verify.h index 3b4c3c23f..9a0083db7 100644 --- a/fsw/cfe-core/src/sb/cfe_sb_verify.h +++ b/fsw/cfe-core/src/sb/cfe_sb_verify.h @@ -80,8 +80,11 @@ #error CFE_PLATFORM_SB_BUF_MEMORY_BYTES cannot be greater than UINT32_MAX (4 Gigabytes)! #endif -#if ((CFE_MISSION_SB_PACKET_TIME_FORMAT == CFE_MISSION_SB_TIME_32_32_SUBS) || \ - (CFE_MISSION_SB_PACKET_TIME_FORMAT == CFE_MISSION_SB_TIME_32_32_M_20)) +/* + * Legacy time formats no longer supported in core cFE, this will pass + * if default is selected or if both defines are removed + */ +#if (CFE_MISSION_SB_PACKET_TIME_FORMAT != CFE_MISSION_SB_TIME_32_16_SUBS) #error Legacy CFE_MISSION_SB_PACKET_TIME_FORMAT implementations no longer supported in core #endif