commit 1b8d7fb355f86284bcaaa3bb79da930ece83ca7c
author Rajavardhan Gundi <rajavardhan.gundi@intel.com> Fri Nov 16 15:53:41 2018 +0530
committer Fabio Utzig <utzig@utzig.org> Thu Dec 27 08:13:41 2018 -0200
tree 1d0246a084ba589fc9ae79fae11f32f8fa2e8714
parent e5aeee4ad184ffb12cd9f34e9286fb384565e681

Use BUILD_ASSERT_MSG instead of _Static_assert in Zephyr

Signed-off-by: Rajavardhan Gundi <rajavardhan.gundi@intel.com>

boot/bootutil/include/bootutil/image.h

diff --git a/boot/bootutil/include/bootutil/image.h b/boot/bootutil/include/bootutil/image.h
index b2d1d94..6989049 100644
--- a/boot/bootutil/include/bootutil/image.h
+++ b/boot/bootutil/include/bootutil/image.h
@@ -22,6 +22,10 @@
 
 #include <inttypes.h>
 
+#ifdef __ZEPHYR__
+#include <toolchain/gcc.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -105,8 +109,13 @@
 
 #define IS_ENCRYPTED(hdr) ((hdr)->ih_flags & IMAGE_F_ENCRYPTED)
 
+#ifdef __ZEPHYR__
+BUILD_ASSERT_MSG(sizeof(struct image_header) == IMAGE_HEADER_SIZE,
+               "struct image_header not required size");
+#else
 _Static_assert(sizeof(struct image_header) == IMAGE_HEADER_SIZE,
                "struct image_header not required size");
+#endif
 
 int bootutil_img_validate(struct image_header *hdr,
                           const struct flash_area *fap,