added a few local vars, to check for reconcile problems

[swftools.git] / lib / as3 / registry.h

diff --git a/lib/as3/registry.h b/lib/as3/registry.h
index 01ca5c0..dc3099e 100644 (file)
--- a/lib/as3/registry.h
+++ b/lib/as3/registry.h
@@ -26,9 +26,10 @@
 
 #include "pool.h"
 
+DECLARE(packageinfo);
 DECLARE(classinfo);
-DECLARE_LIST(classinfo);
 DECLARE(memberinfo);
+DECLARE_LIST(classinfo);
 
 struct _classinfo {
     U8 access;
@@ -36,7 +37,7 @@ struct _classinfo {
     const char*package;
     const char*name;
     union {
-        int slot;        // slot nr in initscript traits
+        ptroff_t slot;        // slot nr in initscript traits
         classinfo_t*cls; // specific class of a Class type
         memberinfo_t*function; //specific function of a Function type
     };
@@ -66,7 +67,7 @@ struct _memberinfo {
 };
 
 extern type_t classinfo_type;
-extern type_t function_signature_type;
+extern type_t memberinfo_type;
 
 void registry_init();
         
@@ -82,7 +83,6 @@ classinfo_t* registry_getintclass();
 classinfo_t* registry_getuintclass();
 classinfo_t* registry_getnullclass();
 classinfo_t* registry_getbooleanclass();
-classinfo_t* memberinfo_asclass();
 classinfo_t* registry_getMovieClip();
 classinfo_t* memberinfo_asclass(memberinfo_t*f);
 classinfo_t* registry_getclassclass(classinfo_t*a);