diff -r 599e88d12f9a -r b2604fc6d25c lib/accessor.h --- a/lib/accessor.h Wed Mar 19 12:13:43 2014 +0000 +++ b/lib/accessor.h Sat Mar 29 22:46:09 2014 +0000 @@ -113,15 +113,15 @@ // variable setting macros -#define __SET_VAR(prefix, name, new_value, ...)\ - if (!(prefix name.flags & __IEC_FORCE_FLAG)) prefix name.value __VA_ARGS__ = new_value -#define __SET_EXTERNAL(prefix, name, new_value, ...)\ +#define __SET_VAR(prefix, name, suffix, new_value)\ + if (!(prefix name.flags & __IEC_FORCE_FLAG)) prefix name.value suffix = new_value +#define __SET_EXTERNAL(prefix, name, suffix, new_value)\ {extern IEC_BYTE __IS_GLOBAL_##name##_FORCED();\ if (!(prefix name.flags & __IEC_FORCE_FLAG || __IS_GLOBAL_##name##_FORCED()))\ - (*(prefix name.value)) __VA_ARGS__ = new_value;} -#define __SET_EXTERNAL_FB(prefix, name, new_value, ...)\ - __SET_VAR((*(prefix name)), __VA_ARGS__, new_value) -#define __SET_LOCATED(prefix, name, new_value, ...)\ - if (!(prefix name.flags & __IEC_FORCE_FLAG)) *(prefix name.value) __VA_ARGS__ = new_value + (*(prefix name.value)) suffix = new_value;} +#define __SET_EXTERNAL_FB(prefix, name, suffix, new_value)\ + __SET_VAR((*(prefix name)), suffix, new_value) +#define __SET_LOCATED(prefix, name, suffix, new_value)\ + if (!(prefix name.flags & __IEC_FORCE_FLAG)) *(prefix name.value) suffix = new_value #endif //__ACCESSOR_H