Merge to subtype-trunk (manually: src/vm/linker.hpp, src/vm/vftbl.hpp)

[cacao.git] / src / vm / vftbl.hpp

diff --git a/src/vm/vftbl.hpp b/src/vm/vftbl.hpp
index 6f5bed5f53fb5fd41b929e675f5fa8e4496371c9..0d47ad10f948e79c65fde6a0841761a7b7256b08 100644 (file)
--- a/src/vm/vftbl.hpp
+++ b/src/vm/vftbl.hpp
@@ -94,7 +94,9 @@ typedef struct _vftbl vftbl_t;
 #include "vm/class.hpp"
 #include "vm/references.h"
 
+#if USES_NEW_SUBTYPE
 #define DISPLAY_SIZE 4
+#endif
 
 struct _vftbl {
        methodptr   *interfacetable[1];    /* interface table (access via macro)  */
@@ -106,10 +108,12 @@ struct _vftbl {
                                           /* (-index for interfaces)             */
        s4           diffval;              /* high - base for runtime type check  */
 
+#if USES_NEW_SUBTYPE
        s4 subtype_depth;
        s4 subtype_offset;
        struct _vftbl *subtype_display[DISPLAY_SIZE+1];  /* the last one is cache */
        struct _vftbl **subtype_overflow;
+#endif
 
        s4          *interfacevftbllength; /* length of interface vftbls          */
        methodptr    table[1];             /* class vftbl                         */