This commit was manufactured by cvs2svn to create branch 'mono-1-0'.

[mono.git] / mono / metadata / typedef.c

diff --git a/mono/metadata/typedef.c b/mono/metadata/typedef.c
index 7c55bcddf1590bc73838203bbe95d52ad405414d..f488ec257456d237739c2f0a4a71530b4e55c2e7 100644 (file)
--- a/mono/metadata/typedef.c
+++ b/mono/metadata/typedef.c
@@ -19,11 +19,10 @@
 void
 mono_typedef_decode (MonoImage *image, guint32 tidx, MonoTypedef *ret)
 {
-       cli_image_info_t *iinfo = image->image_info;
-       metadata_t *m = &iinfo->cli_metadata;
-       metadata_tableinfo_t *tt = m->tables [META_TABLE_TYPEDEF];
+       MonoMetadata *m = &image->metadata;
+       MonoTableInfo *tt = m->tables [MONO_TABLE_TYPEDEF];
        int next_is_valid;
-       guint32 cols_next [6];
+       guint32 cols_next [MONO_TYPEDEF_SIZE];
        guint last;
        
        g_assert (typedef_token < tt->rows);
@@ -33,16 +32,16 @@ mono_typedef_decode (MonoImage *image, guint32 tidx, MonoTypedef *ret)
        /*
         * Get the field and method range
         */
-       ret->field.first = ret->cols [4] - 1;
-       ret->method.first = ret->cols [5] - 1;
+       ret->field.first = ret->cols [MONO_TYPEREF_FIELD_LIST] - 1;
+       ret->method.first = ret->cols [MONO_TYPEDEF_METHOD_LIST] - 1;
        
        if (tt->rows > typedef_idx + 1){
                mono_metadata_decode_row (tt, typedef_idx + 1, cols_next, CSIZE (cols_next));
-               ret->field.last = cols_next [4] - 1;
-               ret->method.last = cols_next [5] - 1;
+               ret->field.last = cols_next [MONO_TYPEREF_FIELD_LIST] - 1;
+               ret->method.last = cols_next [MONO_TYPEREF_FIELD_LIST] - 1;
        } else {
-               ret->field.last = m->tables [META_TABLE_FIELD].rows;
-               ret->field.method = m->tables [META_TABLE_METHOD].rows;
+               ret->field.last = m->tables [MONO_TABLE_FIELD].rows;
+               ret->field.method = m->tables [MONO_TABLE_METHOD].rows;
        }
 
        /*