lib/accessor.h
changeset 894 39086e324665
parent 881 e05d69c1ccb3
parent 885 b2604fc6d25c
--- a/lib/accessor.h	Thu Mar 20 17:27:29 2014 +0100
+++ b/lib/accessor.h	Wed May 28 11:32:09 2014 +0200
@@ -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, ...)\
-	{extern IEC_BYTE __IS_GLOBAL_##name##_FORCED(void);\
-     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
+#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)) 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