Merge branch 'bugfix/ringbuf_static_object_size_v5.1' into 'release/v…

…5.1' Ringbuf: Fix ordering of StaticRingbuffer_t (v5.1) See merge request espressif/esp-idf!24593
espressif · Jul 5, 2023 · c66e4a8 · c66e4a8
2 parents 09808b7 + 8cb70f0
commit c66e4a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/components/esp_ringbuf/include/freertos/ringbuf.h b/components/esp_ringbuf/include/freertos/ringbuf.h
@@ -57,8 +57,8 @@ typedef struct xSTATIC_RINGBUFFER {
     /** @cond */    //Doxygen command to hide this structure from API Reference
     size_t xDummy1[2];
     UBaseType_t uxDummy2;
-    BaseType_t xDummy3;
-    void *pvDummy4[11];
+    void *pvDummy3[11];
+    BaseType_t xDummy4;
     StaticList_t xDummy5[2];
     void * pvDummy6;
     portMUX_TYPE muxDummy;

diff --git a/components/esp_ringbuf/ringbuf.c b/components/esp_ringbuf/ringbuf.c
@@ -73,9 +73,7 @@ typedef struct RingbufferDefinition {
     portMUX_TYPE mux;                           //Spinlock required for SMP
 } Ringbuffer_t;
 
-#if __GNUC_PREREQ(4, 6)
 _Static_assert(sizeof(StaticRingbuffer_t) == sizeof(Ringbuffer_t), "StaticRingbuffer_t != Ringbuffer_t");
-#endif
 
 // ------------------------------------------------ Forward Declares ---------------------------------------------------