Move type check after initialization to make compiler happy

1 files changed, 8 insertions, 1 deletions

diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index bcf923fcc..d1a045b8b 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -93,7 +93,14 @@
  * @param mh message to nest
  * @return a newly allocated 'struct GNUNET_MQ_Envelope *'
  */
-#define GNUNET_MQ_msg_nested_mh(mvar, type, mh) GNUNET_MQ_msg_nested_mh_((((void)(mvar)->header), (struct GNUNET_MessageHeader**) &(mvar)), sizeof (*(mvar)), (type), mh)
+#define GNUNET_MQ_msg_nested_mh(mvar, type, mh) \
+  ({struct GNUNET_MQ_Envelope *_ev;\
+    _ev = GNUNET_MQ_msg_nested_mh_((struct GNUNET_MessageHeader**) &(mvar),\
+                                   sizeof (*(mvar)),\
+                                   (type),\
+                                   (mh));\
+   (void)(mvar)->header; /* type check */\
+   _ev;})
 
 
 /**