diff options
Diffstat (limited to 'lobject.h')
-rw-r--r-- | lobject.h | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lobject.h,v 2.94 2014/06/19 18:39:36 roberto Exp roberto $ | 2 | ** $Id: lobject.h,v 2.95 2014/07/17 17:09:50 roberto Exp roberto $ |
3 | ** Type definitions for Lua objects | 3 | ** Type definitions for Lua objects |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -85,9 +85,7 @@ typedef struct GCObject GCObject; | |||
85 | ** Common type has only the common header | 85 | ** Common type has only the common header |
86 | */ | 86 | */ |
87 | struct GCObject { | 87 | struct GCObject { |
88 | struct { | 88 | CommonHeader; |
89 | CommonHeader; | ||
90 | } gch; | ||
91 | }; | 89 | }; |
92 | 90 | ||
93 | 91 | ||
@@ -179,7 +177,7 @@ typedef struct lua_TValue TValue; | |||
179 | 177 | ||
180 | 178 | ||
181 | /* Macros for internal tests */ | 179 | /* Macros for internal tests */ |
182 | #define righttt(obj) (ttype(obj) == gcvalue(obj)->gch.tt) | 180 | #define righttt(obj) (ttype(obj) == gcvalue(obj)->tt) |
183 | 181 | ||
184 | #define checkliveness(g,obj) \ | 182 | #define checkliveness(g,obj) \ |
185 | lua_longassert(!iscollectable(obj) || \ | 183 | lua_longassert(!iscollectable(obj) || \ |
@@ -208,7 +206,7 @@ typedef struct lua_TValue TValue; | |||
208 | 206 | ||
209 | #define setgcovalue(L,obj,x) \ | 207 | #define setgcovalue(L,obj,x) \ |
210 | { TValue *io = (obj); GCObject *i_g=(x); \ | 208 | { TValue *io = (obj); GCObject *i_g=(x); \ |
211 | val_(io).gc = i_g; settt_(io, ctb(gch(i_g)->tt)); } | 209 | val_(io).gc = i_g; settt_(io, ctb(i_g->tt)); } |
212 | 210 | ||
213 | #define setsvalue(L,obj,x) \ | 211 | #define setsvalue(L,obj,x) \ |
214 | { TValue *io = (obj); TString *x_ = (x); \ | 212 | { TValue *io = (obj); TString *x_ = (x); \ |