[GNUnet-SVN] r38220 - gnunet/src/include

[gnunet]

Author: amatus
Date: 2016-10-26 20:55:25 +0200 (Wed, 26 Oct 2016)
New Revision: 38220

Modified:
   gnunet/src/include/gnunet_mq_lib.h
Log:
Move type check after initialization to make compiler happy


Modified: gnunet/src/include/gnunet_mq_lib.h
===================================================================
--- gnunet/src/include/gnunet_mq_lib.h  2016-10-26 18:16:44 UTC (rev 38219)
+++ gnunet/src/include/gnunet_mq_lib.h  2016-10-26 18:55:25 UTC (rev 38220)
@@ -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;})
 
 
 /**