--- libaitio/inc/aitio.h	2012/08/01 00:37:07	1.23
+++ libaitio/inc/aitio.h	2012/08/01 01:02:43	1.23.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.23 2012/08/01 00:37:07 misho Exp $
+* $Id: aitio.h,v 1.23.2.1 2012/08/01 01:02:43 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -310,16 +310,16 @@ typedef struct {
 						__val->val_type = f64; __val->val.f64 = _n; \
 						AIT_LEN(__val) = sizeof(double); } while (0)
 
-#define AIT_COPY_VAL(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \
-						memcpy(__val, (_v), sizeof(ait_val_t)); \
-						switch (AIT_TYPE(__val)) { \
+#define AIT_COPY_VAL(_vl, _v)		do { assert((_vl)); assert((_v)); \
+						memcpy((_vl), (_v), sizeof(ait_val_t)); \
+						switch (AIT_TYPE((_vl))) { \
 							case buffer: \
-								AIT_SET_BUF(__val, \
+								AIT_SET_BUF((_vl), \
 										AIT_GET_BUF((_v)), \
 										AIT_LEN((_v))); \
 								break; \
 							case string: \
-								AIT_SET_STR(__val, \
+								AIT_SET_STR((_vl), \
 										AIT_GET_STR((_v))); \
 								break; \
 							default: \