From 75525de1dd68aa4dcb2240a0cfffca5a3692bc27 Mon Sep 17 00:00:00 2001 From: Jonas Otto Date: Mon, 16 May 2022 18:45:15 +0200 Subject: [PATCH] ring_buffer: fix designated initializer order in RING_BUF_DECLARE Change order of designated initializers for ring_buf struct in the RING_BUF_DECLARE macro, to match the order in the struct definition. This fixes compilation when using C++, which requires using the same order as in the struct definition. Fixes #45697 Signed-off-by: Jonas Otto --- include/zephyr/sys/ring_buffer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/zephyr/sys/ring_buffer.h b/include/zephyr/sys/ring_buffer.h index 6c31c603848eb..903b7c811a16e 100644 --- a/include/zephyr/sys/ring_buffer.h +++ b/include/zephyr/sys/ring_buffer.h @@ -78,8 +78,8 @@ static inline void ring_buf_internal_reset(struct ring_buf *buf, int32_t value) RING_BUFFER_SIZE_ASSERT_MSG); \ static uint8_t __noinit _ring_buffer_data_##name[size8]; \ struct ring_buf name = { \ - .size = size8, \ - .buffer = _ring_buffer_data_##name \ + .buffer = _ring_buffer_data_##name, \ + .size = size8 \ } /**