X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fabc.h;h=54749f7b04d6946c4d1c32a6c9304e2d0560a09d;hb=526504e079a22cfa2981d86575dd6daf77f74931;hp=57a5c9b3c52f197ce0f52d69afa6460629a97153;hpb=c68811fbe7f54b25f683753c94659bf6e1c83999;p=swftools.git

diff --git a/lib/as3/abc.h b/lib/as3/abc.h
index 57a5c9b..54749f7 100644
--- a/lib/as3/abc.h
+++ b/lib/as3/abc.h
@@ -32,8 +32,8 @@ DECLARE(abc_method);
 DECLARE(abc_method_body);
 DECLARE(abc_interface);
 DECLARE(abc_class);
-DECLARE(exception);
-DECLARE_LIST(exception);
+DECLARE(abc_exception);
+DECLARE_LIST(abc_exception);
 
 #include "code.h"
 #include "opcodes.h"
@@ -112,12 +112,12 @@ struct _abc_class {
     multiname_list_t*interfaces;
 
     abc_method_t*constructor;
-    U8 flags;
+    trait_list_t*traits;
     
     abc_method_t*static_constructor;
-
-    trait_list_t*static_constructor_traits;
-    trait_list_t*traits;
+    trait_list_t*static_traits;
+    
+    U8 flags;
 
     int init_scope_depth; // volatile, might be increased during code verification
     
@@ -136,7 +136,7 @@ abc_method_body_t* abc_class_staticconstructor(abc_class_t*cls, multiname_t*retu
 abc_method_body_t* abc_class_constructor(abc_class_t*cls, multiname_t*returntype, int num_params, ...);
 abc_method_body_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, char*name, int num_params, ...);
 
-struct _exception {
+struct _abc_exception {
     code_t*from;
     code_t*to;
     code_t*target;
@@ -160,7 +160,7 @@ struct _abc_method_body {
 
     int init_scope_depth; // volatile, might be increased during code verification
 
-    exception_list_t* exceptions;
+    abc_exception_list_t* exceptions;
 
     trait_list_t*traits;