renamed exception to abc_exception (to make MingW happy)

diff --git a/lib/as3/abc.c b/lib/as3/abc.c
index f417e16..700f050 100644 (file)
--- a/lib/as3/abc.c
+++ b/lib/as3/abc.c
@@ -1084,11 +1084,11 @@ void swf_WriteABC(TAG*abctag, void*code)
         abc_exception_list_t*l = c->exceptions;
         while(l) {
             // warning: assumes "pos" in each code_t is up-to-date
-            swf_SetU30(tag, l->abc_exception->from->pos);
-            swf_SetU30(tag, l->abc_exception->to->pos);
-            swf_SetU30(tag, l->abc_exception->target->pos);
-            swf_SetU30(tag, pool_register_multiname(pool, l->abc_exception->exc_type));
-            swf_SetU30(tag, pool_register_multiname(pool, l->abc_exception->var_name));
+            swf_SetU30(tag, l->exception->from->pos);
+            swf_SetU30(tag, l->exception->to->pos);
+            swf_SetU30(tag, l->exception->target->pos);
+            swf_SetU30(tag, pool_register_multiname(pool, l->exception->exc_type));
+            swf_SetU30(tag, pool_register_multiname(pool, l->exception->var_name));
             l = l->next;
         }
 
@@ -1204,7 +1204,7 @@ void abc_file_free(abc_file_t*file)
 
         abc_exception_list_t*ee = body->exceptions;
         while(ee) {
-            abc_exception_t*e=ee->abc_exception;ee->abc_exception=0;
+            abc_exception_t*e=ee->exception;ee->exception=0;
             e->from = e->to = e->target = 0;
             multiname_destroy(e->exc_type);e->exc_type=0;
             multiname_destroy(e->var_name);e->var_name=0;

diff --git a/lib/as3/code.c b/lib/as3/code.c
index 205f07e..f3b9b98 100644 (file)
--- a/lib/as3/code.c
+++ b/lib/as3/code.c
@@ -775,7 +775,7 @@ static char callcode(currentstats_t*stats, int pos, int stack, int scope)
     return 1;
 }
 
-static currentstats_t* code_get_stats(code_t*code, exception_list_t*exceptions) 
+static currentstats_t* code_get_stats(code_t*code, abc_exception_list_t*exceptions) 
 {
     code = code_find_start(code);
     int num = 0;
@@ -824,7 +824,7 @@ static currentstats_t* code_get_stats(code_t*code, exception_list_t*exceptions)
         free(current);
         return 0;
     }
-    exception_list_t*e = exceptions;
+    abc_exception_list_t*e = exceptions;
     while(e) {
         if(e->exception->target)
             callcode(current, e->exception->target->pos, 1, 0);
@@ -842,9 +842,9 @@ void stats_free(currentstats_t*stats)
     }
 }
 
-int code_dump(code_t*c, exception_list_t*exceptions, abc_file_t*file, char*prefix, FILE*fo)
+int code_dump(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*prefix, FILE*fo)
 {
-    exception_list_t*e = exceptions;
+    abc_exception_list_t*e = exceptions;
     c = code_find_start(c);
     currentstats_t*stats =  code_get_stats(c, exceptions);
 
@@ -977,7 +977,7 @@ int code_dump(code_t*c, exception_list_t*exceptions, abc_file_t*file, char*prefi
     return 1;
 }
 
-codestats_t* code_get_statistics(code_t*code, exception_list_t*exceptions) 
+codestats_t* code_get_statistics(code_t*code, abc_exception_list_t*exceptions) 
 {
     currentstats_t*current = code_get_stats(code, exceptions);
     if(!current)