Merge bfe8cd1e343f35a108a3d83726e22821ffbd0e0a into 7a85414eced71d3208d0cbffa1a9e7a6a0b5fcc1

blisp_struct.h: use _Static_assert for pre-C23 compatibility
Closes: https://github.com/pine64/blisp/issues/61
2025-08-21 11:00:52 +00:00 · 2024-01-05 14:30:55 +00:00 · 2024-01-05 22:30:13 +08:00
1 changed files with 2 additions and 8 deletions
--- a/include/blisp_struct.h
+++ b/include/blisp_struct.h
@ -9,12 +9,6 @@
 #include <assert.h>
 #include <stdint.h>

-#if !defined(static_assert) && (defined(__GNUC__) || defined(__clang__)) \
-    && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
-    && __STDC_VERSION__ <= 201710L
-#define static_assert _Static_assert
-#endif
-
 #pragma pack(push, 1)

 typedef struct {
@ -160,7 +154,7 @@ struct bfl_boot_header {
  uint32_t crc32;
 };

-static_assert(sizeof(struct bfl_boot_header) == 176,
+_Static_assert(sizeof(struct bfl_boot_header) == 176,
              "Bootheader have wrong size");

 struct blflash_segment_header {
@ -170,7 +164,7 @@ struct blflash_segment_header {
  uint32_t crc32;
 };

-static_assert(sizeof(struct blflash_segment_header) == 16,
+_Static_assert(sizeof(struct blflash_segment_header) == 16,
              "Segment header have wrong size");

 #pragma pack(pop)
Author	SHA1	Message	Date
Sergey Fedorov	a20c719298	Merge bfe8cd1e343f35a108a3d83726e22821ffbd0e0a into 7a85414eced71d3208d0cbffa1a9e7a6a0b5fcc1	2024-01-05 14:30:55 +00:00
Sergey Fedorov	bfe8cd1e34	blisp_struct.h: use _Static_assert for pre-C23 compatibility Closes: https://github.com/pine64/blisp/issues/61	2024-01-05 22:30:13 +08:00