--- a/lib/accessor.h Tue Sep 27 00:07:16 2011 +0200
+++ b/lib/accessor.h Wed Feb 01 13:01:08 2012 +0000
@@ -32,6 +32,8 @@
type* __GET_GLOBAL_##name(void) {\
return (*GLOBAL__##name).value;\
}
+#define __DECLARE_GLOBAL_PROTOTYPE(type, name)\
+ extern type* __GET_GLOBAL_##name();
#define __DECLARE_EXTERNAL(type, name)\
__IEC_##type##_p name;
#define __DECLARE_LOCATED(type, name)\
@@ -55,7 +57,6 @@
__INIT_RETAIN(domain##__##name, retained)
#define __INIT_EXTERNAL(type, global, name, retained)\
{\
- extern type* __GET_GLOBAL_##global();\
name.value = __GET_GLOBAL_##global();\
__INIT_RETAIN(name, retained)\
}
@@ -73,15 +74,15 @@
#define __GET_VAR(name, ...)\
name.value __VA_ARGS__
#define __GET_EXTERNAL(name, ...)\
- ((name.flags & __IEC_FORCE_FLAG) ? name.fvalue __VA_ARGS__ : *(name.value) __VA_ARGS__)
+ ((name.flags & __IEC_FORCE_FLAG) ? name.fvalue __VA_ARGS__ : (*(name.value)) __VA_ARGS__)
#define __GET_LOCATED(name, ...)\
- ((name.flags & __IEC_FORCE_FLAG) ? name.fvalue __VA_ARGS__ : *(name.value) __VA_ARGS__)
+ ((name.flags & __IEC_FORCE_FLAG) ? name.fvalue __VA_ARGS__ : (*(name.value)) __VA_ARGS__)
#define __GET_VAR_BY_REF(name, ...)\
((name.flags & __IEC_FORCE_FLAG) ? &(name.fvalue __VA_ARGS__) : &(name.value __VA_ARGS__))
#define __GET_EXTERNAL_BY_REF(name, ...)\
- ((name.flags & __IEC_FORCE_FLAG) ? &(name.fvalue __VA_ARGS__) : &(*(name.value) __VA_ARGS__))
+ ((name.flags & __IEC_FORCE_FLAG) ? &(name.fvalue __VA_ARGS__) : &((*(name.value)) __VA_ARGS__))
#define __GET_LOCATED_BY_REF(name, ...)\
- ((name.flags & __IEC_FORCE_FLAG) ? &(name.fvalue __VA_ARGS__) : &(*(name.value) __VA_ARGS__))
+ ((name.flags & __IEC_FORCE_FLAG) ? &(name.fvalue __VA_ARGS__) : &((*(name.value)) __VA_ARGS__))
// variable setting macros
#define __SET_VAR(prefix, name, new_value, ...)\