--- libaitio/inc/aitio.h	2012/05/23 14:10:11	1.18.2.6
+++ libaitio/inc/aitio.h	2012/06/25 14:34:40	1.18.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.18.2.6 2012/05/23 14:10:11 misho Exp $
+* $Id: aitio.h,v 1.18.2.7 2012/06/25 14:34:40 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -156,8 +156,8 @@ typedef struct {
 						(_vl) = __val; \
 					} while (0);
 #define AIT_SET_PTR(_vl, _p, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
-						__val->val_type = ptr; AIT_LEN(__val) = _len; \
-						__val->val.ptr = _p; } while (0)
+						__val->val_type = ptr; __val->val.ptr = _p; \
+						AIT_LEN(__val) = _len; } while (0)
 #define AIT_RE_BUF(_vl, _len)		do { ait_val_t *__val = (_vl); assert(__val); \
 						void *__ptr = io_realloc(AIT_GET_BUF(__val), _len); \
 						if (__ptr) { \
@@ -195,8 +195,8 @@ typedef struct {
 									AIT_LEN(__val)); \
 						} } while (0)
 #define AIT_SET_BLOB(_vl, _n, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
-						__val->val_type = blob; AIT_LEN(__val) = _len; \
-						__val->val.blob = _n; } while (0)
+						__val->val_type = blob; __val->val.blob = _n; \
+						AIT_LEN(__val) = _len; } while (0)
 #define AIT_SET_BLOB2(_vl, _bv)		do { ait_val_t *__val = (_vl); assert(__val); assert((_bv)); \
 						__val->val_type = blob; AIT_LEN(__val) = (_bv)->blob_len; \
 						__val->val.blob = (_bv)->blob_var; } while (0)