2006-06-20 Martin Baulig <martin@ximian.com>

[mono.git] / mono / metadata / row-indexes.h

diff --git a/mono/metadata/row-indexes.h b/mono/metadata/row-indexes.h
index 163b44939fab78e034146b7ed211f6cc4dd8ed50..4c306bb057f101057f850c6853ea5efd0ad75582 100644 (file)
--- a/mono/metadata/row-indexes.h
+++ b/mono/metadata/row-indexes.h
@@ -267,9 +267,6 @@ enum {
        MONO_GENERICPARAM_FLAGS,
        MONO_GENERICPARAM_OWNER,
        MONO_GENERICPARAM_NAME,
-
-       /* Next two soon to be gone */
-       MONO_GENERICPARAM_KIND,
        
        MONO_GENERICPARAM_SIZE
 };
@@ -293,117 +290,117 @@ enum {
  */
 
 enum {
-       TYPEDEFORREF_TYPEDEF,
-       TYPEDEFORREF_TYPEREF,
-       TYPEDEFORREF_TYPESPEC,
-       TYPEDEFORREF_BITS = 2,
-       TYPEDEFORREF_MASK = 3
+       MONO_TYPEDEFORREF_TYPEDEF,
+       MONO_TYPEDEFORREF_TYPEREF,
+       MONO_TYPEDEFORREF_TYPESPEC,
+       MONO_TYPEDEFORREF_BITS = 2,
+       MONO_TYPEDEFORREF_MASK = 3
 };
 
 enum {
-       HASCONSTANT_FIEDDEF,
-       HASCONSTANT_PARAM,
-       HASCONSTANT_PROPERTY,
-       HASCONSTANT_BITS = 2,
-       HASCONSTANT_MASK = 3
+       MONO_HASCONSTANT_FIEDDEF,
+       MONO_HASCONSTANT_PARAM,
+       MONO_HASCONSTANT_PROPERTY,
+       MONO_HASCONSTANT_BITS = 2,
+       MONO_HASCONSTANT_MASK = 3
 };
 
 enum {
-       CUSTOM_ATTR_METHODDEF,
-       CUSTOM_ATTR_FIELDDEF,
-       CUSTOM_ATTR_TYPEREF,
-       CUSTOM_ATTR_TYPEDEF,
-       CUSTOM_ATTR_PARAMDEF,
-       CUSTOM_ATTR_INTERFACE,
-       CUSTOM_ATTR_MEMBERREF,
-       CUSTOM_ATTR_MODULE,
-       CUSTOM_ATTR_PERMISSION,
-       CUSTOM_ATTR_PROPERTY,
-       CUSTOM_ATTR_EVENT,
-       CUSTOM_ATTR_SIGNATURE,
-       CUSTOM_ATTR_MODULEREF,
-       CUSTOM_ATTR_TYPESPEC,
-       CUSTOM_ATTR_ASSEMBLY,
-       CUSTOM_ATTR_ASSEMBLYREF,
-       CUSTOM_ATTR_FILE,
-       CUSTOM_ATTR_EXP_TYPE,
-       CUSTOM_ATTR_MANIFEST,
-       CUSTOM_ATTR_GENERICPAR,
-       CUSTOM_ATTR_BITS = 5,
-       CUSTOM_ATTR_MASK = 0x1F
+       MONO_CUSTOM_ATTR_METHODDEF,
+       MONO_CUSTOM_ATTR_FIELDDEF,
+       MONO_CUSTOM_ATTR_TYPEREF,
+       MONO_CUSTOM_ATTR_TYPEDEF,
+       MONO_CUSTOM_ATTR_PARAMDEF,
+       MONO_CUSTOM_ATTR_INTERFACE,
+       MONO_CUSTOM_ATTR_MEMBERREF,
+       MONO_CUSTOM_ATTR_MODULE,
+       MONO_CUSTOM_ATTR_PERMISSION,
+       MONO_CUSTOM_ATTR_PROPERTY,
+       MONO_CUSTOM_ATTR_EVENT,
+       MONO_CUSTOM_ATTR_SIGNATURE,
+       MONO_CUSTOM_ATTR_MODULEREF,
+       MONO_CUSTOM_ATTR_TYPESPEC,
+       MONO_CUSTOM_ATTR_ASSEMBLY,
+       MONO_CUSTOM_ATTR_ASSEMBLYREF,
+       MONO_CUSTOM_ATTR_FILE,
+       MONO_CUSTOM_ATTR_EXP_TYPE,
+       MONO_CUSTOM_ATTR_MANIFEST,
+       MONO_CUSTOM_ATTR_GENERICPAR,
+       MONO_CUSTOM_ATTR_BITS = 5,
+       MONO_CUSTOM_ATTR_MASK = 0x1F
 };
 
 enum {
-       HAS_FIELD_MARSHAL_FIELDSREF,
-       HAS_FIELD_MARSHAL_PARAMDEF,
-       HAS_FIELD_MARSHAL_BITS = 1,
-       HAS_FIELD_MARSHAL_MASK = 1
+       MONO_HAS_FIELD_MARSHAL_FIELDSREF,
+       MONO_HAS_FIELD_MARSHAL_PARAMDEF,
+       MONO_HAS_FIELD_MARSHAL_BITS = 1,
+       MONO_HAS_FIELD_MARSHAL_MASK = 1
 };
 
 enum {
-       HAS_DECL_SECURITY_TYPEDEF,
-       HAS_DECL_SECURITY_METHODDEF,
-       HAS_DECL_SECURITY_ASSEMBLY,
-       HAS_DECL_SECURITY_BITS = 2,
-       HAS_DECL_SECURITY_MASK = 3
+       MONO_HAS_DECL_SECURITY_TYPEDEF,
+       MONO_HAS_DECL_SECURITY_METHODDEF,
+       MONO_HAS_DECL_SECURITY_ASSEMBLY,
+       MONO_HAS_DECL_SECURITY_BITS = 2,
+       MONO_HAS_DECL_SECURITY_MASK = 3
 };
 
 enum {
-       MEMBERREF_PARENT_TYPEDEF, /* not used */
-       MEMBERREF_PARENT_TYPEREF,
-       MEMBERREF_PARENT_MODULEREF,
-       MEMBERREF_PARENT_METHODDEF,
-       MEMBERREF_PARENT_TYPESPEC,
-       MEMBERREF_PARENT_BITS = 3,
-       MEMBERREF_PARENT_MASK = 7
+       MONO_MEMBERREF_PARENT_TYPEDEF, /* not used */
+       MONO_MEMBERREF_PARENT_TYPEREF,
+       MONO_MEMBERREF_PARENT_MODULEREF,
+       MONO_MEMBERREF_PARENT_METHODDEF,
+       MONO_MEMBERREF_PARENT_TYPESPEC,
+       MONO_MEMBERREF_PARENT_BITS = 3,
+       MONO_MEMBERREF_PARENT_MASK = 7
 };
 
 enum {
-       HAS_SEMANTICS_EVENT,
-       HAS_SEMANTICS_PROPERTY,
-       HAS_SEMANTICS_BITS = 1,
-       HAS_SEMANTICS_MASK = 1
+       MONO_HAS_SEMANTICS_EVENT,
+       MONO_HAS_SEMANTICS_PROPERTY,
+       MONO_HAS_SEMANTICS_BITS = 1,
+       MONO_HAS_SEMANTICS_MASK = 1
 };
 
 enum {
-       METHODDEFORREF_METHODDEF,
-       METHODDEFORREF_METHODREF,
-       METHODDEFORREF_BITS = 1,
-       METHODDEFORREF_MASK = 1
+       MONO_METHODDEFORREF_METHODDEF,
+       MONO_METHODDEFORREF_METHODREF,
+       MONO_METHODDEFORREF_BITS = 1,
+       MONO_METHODDEFORREF_MASK = 1
 };
 
 enum {
-       MEMBERFORWD_FIELDDEF,
-       MEMBERFORWD_METHODDEF,
-       MEMBERFORWD_BITS = 1,
-       MEMBERFORWD_MASK = 1
+       MONO_MEMBERFORWD_FIELDDEF,
+       MONO_MEMBERFORWD_METHODDEF,
+       MONO_MEMBERFORWD_BITS = 1,
+       MONO_MEMBERFORWD_MASK = 1
 };
 
 enum {
-       IMPLEMENTATION_FILE,
-       IMPLEMENTATION_ASSEMBLYREF,
-       IMPLEMENTATION_EXP_TYPE,
-       IMPLEMENTATION_BITS = 2,
-       IMPLEMENTATION_MASK = 3
+       MONO_IMPLEMENTATION_FILE,
+       MONO_IMPLEMENTATION_ASSEMBLYREF,
+       MONO_IMPLEMENTATION_EXP_TYPE,
+       MONO_IMPLEMENTATION_BITS = 2,
+       MONO_IMPLEMENTATION_MASK = 3
 };
 
 enum {
-       CUSTOM_ATTR_TYPE_TYPEREF, /* not used */
-       CUSTOM_ATTR_TYPE_TYPEDEF, /* not used */
-       CUSTOM_ATTR_TYPE_METHODDEF,
-       CUSTOM_ATTR_TYPE_MEMBERREF,
-       CUSTOM_ATTR_TYPE_STRING, /* not used */
-       CUSTOM_ATTR_TYPE_BITS = 3,
-       CUSTOM_ATTR_TYPE_MASK = 7
+       MONO_CUSTOM_ATTR_TYPE_TYPEREF, /* not used */
+       MONO_CUSTOM_ATTR_TYPE_TYPEDEF, /* not used */
+       MONO_CUSTOM_ATTR_TYPE_METHODDEF,
+       MONO_CUSTOM_ATTR_TYPE_MEMBERREF,
+       MONO_CUSTOM_ATTR_TYPE_STRING, /* not used */
+       MONO_CUSTOM_ATTR_TYPE_BITS = 3,
+       MONO_CUSTOM_ATTR_TYPE_MASK = 7
 };
 
 enum {
-       RESOLTION_SCOPE_MODULE,
-       RESOLTION_SCOPE_MODULEREF,
-       RESOLTION_SCOPE_ASSEMBLYREF,
-       RESOLTION_SCOPE_TYPEREF,
-       RESOLTION_SCOPE_BITS = 2,
-       RESOLTION_SCOPE_MASK = 3
+       MONO_RESOLTION_SCOPE_MODULE,
+       MONO_RESOLTION_SCOPE_MODULEREF,
+       MONO_RESOLTION_SCOPE_ASSEMBLYREF,
+       MONO_RESOLTION_SCOPE_TYPEREF,
+       MONO_RESOLTION_SCOPE_BITS = 2,
+       MONO_RESOLTION_SCOPE_MASK = 3
 };
 
 enum {
@@ -415,3 +412,4 @@ enum {
 
 #endif /* __MONO_METADATA_ROW_INDEXES_H__ */
 
+