From e37c7853566020469300e3ccd1ce65c7a94a12d4 Mon Sep 17 00:00:00 2001 From: Peter Bigot Date: Tue, 7 Jul 2020 12:34:05 -0500 Subject: [PATCH] kernel: fix timer initializer field order Recent changes to struct _timeout changed the declaration order to avoid alignment padding. While this has no effect to C99 code C++ requires that designated initializes appear in declaration order. Update the initializer macro so it can be used in C++ code. Signed-off-by: Peter Bigot --- include/kernel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/kernel.h b/include/kernel.h index 84e57d0a0c6..66306f2d205 100644 --- a/include/kernel.h +++ b/include/kernel.h @@ -1773,8 +1773,8 @@ struct k_timer { { \ .timeout = { \ .node = {},\ + .fn = z_timer_expiration_handler, \ .dticks = 0, \ - .fn = z_timer_expiration_handler \ }, \ .wait_q = Z_WAIT_Q_INIT(&obj.wait_q), \ .expiry_fn = expiry, \