barrier macros rewritten as expressions

1 files changed, 13 insertions, 13 deletions

diff --git a/lgc.h b/lgc.h
index b5465970..bd5020cb 100644
--- a/lgc.h
+++ b/lgc.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lgc.h,v 2.85 2014/07/19 15:14:46 roberto Exp roberto $
+** $Id: lgc.h,v 2.86 2014/10/25 11:50:46 roberto Exp roberto $
 ** Garbage Collector
 ** See Copyright Notice in lua.h
 */
@@ -106,21 +106,21 @@
 #define luaC_checkGC(L)         luaC_condGC(L, luaC_step(L);)
 
 
-#define luaC_barrier(L,p,v) {  \
-        if (iscollectable(v) && isblack(p) && iswhite(gcvalue(v)))  \
-        luaC_barrier_(L,obj2gco(p),gcvalue(v)); }
+#define luaC_barrier(L,p,v) (  \
+        (iscollectable(v) && isblack(p) && iswhite(gcvalue(v))) ?  \
+        luaC_barrier_(L,obj2gco(p),gcvalue(v)) : cast_void(0))
 
-#define luaC_barrierback(L,p,v) {  \
-        if (iscollectable(v) && isblack(p) && iswhite(gcvalue(v)))  \
-        luaC_barrierback_(L,p); }
+#define luaC_barrierback(L,p,v) (  \
+        (iscollectable(v) && isblack(p) && iswhite(gcvalue(v))) ? \
+        luaC_barrierback_(L,p) : cast_void(0))
 
-#define luaC_objbarrier(L,p,o) {  \
-        if (isblack(p) && iswhite(o)) \
-                luaC_barrier_(L,obj2gco(p),obj2gco(o)); }
+#define luaC_objbarrier(L,p,o) (  \
+        (isblack(p) && iswhite(o)) ? \
+        luaC_barrier_(L,obj2gco(p),obj2gco(o)) : cast_void(0))
 
-#define luaC_upvalbarrier(L,uv) \
-  { if (iscollectable((uv)->v) && !upisopen(uv)) \
-         luaC_upvalbarrier_(L,uv); }
+#define luaC_upvalbarrier(L,uv) ( \
+        (iscollectable((uv)->v) && !upisopen(uv)) ? \
+         luaC_upvalbarrier_(L,uv) : cast_void(0))
 
 LUAI_FUNC void luaC_fix (lua_State *L, GCObject *o);
 LUAI_FUNC void luaC_freeallobjects (lua_State *L);