From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 6 May 2019 13:56:19 +0000 (-0400)
Subject: Cleanup: update code layout to fix old gcc warning
X-Git-Tag: v0.11.0~2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=cafe8ce139ea02d497582c4abb27d065e6e46d79;p=urcu.git

Cleanup: update code layout to fix old gcc warning

Some CI jobs show:

urcu-pointer.o
13:46:22 In file included from urcu.c:49:0:
13:46:22 urcu-wait.h:70:9: warning: missing initializer for field 'lock' of 'struct cds_wfs_stack' [-Wmissing-field-initializers]
13:46:22   struct urcu_wait_queue name = URCU_WAIT_QUEUE_HEAD_INIT(name)
13:46:22          ^
13:46:22 urcu.c:150:8: note: in expansion of macro 'DEFINE_URCU_WAIT_QUEUE'
13:46:22  static DEFINE_URCU_WAIT_QUEUE(gp_waiters);
13:46:22         ^
13:46:22 In file included from urcu-wait.h:27:0,
13:46:22                  from urcu.c:49:
13:46:22 ../include/urcu/wfstack.h:92:18: note: 'lock' declared here
13:46:22   pthread_mutex_t lock;
13:46:22

Change code layout so not to confuse old gcc.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/src/urcu-wait.h b/src/urcu-wait.h
index 94f3e35..47ac5eb 100644
--- a/src/urcu-wait.h
+++ b/src/urcu-wait.h
@@ -60,8 +60,13 @@ struct urcu_wait_queue {
 	struct cds_wfs_stack stack;
 };
 
-#define URCU_WAIT_QUEUE_HEAD_INIT(name)			\
-	{ .stack.head = CDS_WFS_END, .stack.lock = PTHREAD_MUTEX_INITIALIZER }
+#define URCU_WAIT_QUEUE_HEAD_INIT(name)				\
+	{							\
+		 .stack = {					\
+			.head = CDS_WFS_END,			\
+			.lock = PTHREAD_MUTEX_INITIALIZER,	\
+		},						\
+	}
 
 #define DECLARE_URCU_WAIT_QUEUE(name)			\
 	struct urcu_wait_queue name