Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / metadata / tabledefs.h

diff --git a/mono/metadata/tabledefs.h b/mono/metadata/tabledefs.h
index 1af97bf445cc563c2e85557243aa7978946bb0fc..e3aa51b4cf5f8673bf6f9980648eb88d48084698 100644 (file)
--- a/mono/metadata/tabledefs.h
+++ b/mono/metadata/tabledefs.h
@@ -1,5 +1,6 @@
-/*
- * tabledefs.h: This file contains the various definitions for constants
+/**
+ * \file
+ * This file contains the various definitions for constants
  * found on the metadata tables
  *
  * Author:
@@ -126,6 +127,8 @@ enum {
 
 #define TYPE_ATTRIBUTE_IMPORT                0x00001000
 #define TYPE_ATTRIBUTE_SERIALIZABLE          0x00002000
+#define TYPE_ATTRIBUTE_WINDOWS_RUNTIME       0x00004000
+
 
 #define TYPE_ATTRIBUTE_STRING_FORMAT_MASK    0x00030000
 #define TYPE_ATTRIBUTE_ANSI_CLASS            0x00000000
@@ -158,7 +161,9 @@ enum {
 #define METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL        0x1000
 #define METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED         0x0020
 #define METHOD_IMPL_ATTRIBUTE_NOINLINING           0x0008
+#define METHOD_IMPL_ATTRIBUTE_NOOPTIMIZATION       0x0040
 #define METHOD_IMPL_ATTRIBUTE_MAX_METHOD_IMPL_VAL  0xffff
+#define METHOD_IMPL_ATTRIBUTE_AGGRESSIVE_INLINING  0x0100
 
 #define METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK        0x0007
 #define METHOD_ATTRIBUTE_COMPILER_CONTROLLED       0x0000
@@ -178,6 +183,7 @@ enum {
 #define METHOD_ATTRIBUTE_REUSE_SLOT                0x0000
 #define METHOD_ATTRIBUTE_NEW_SLOT                  0x0100
 
+#define METHOD_ATTRIBUTE_STRICT                    0x0200
 #define METHOD_ATTRIBUTE_ABSTRACT                  0x0400
 #define METHOD_ATTRIBUTE_SPECIAL_NAME              0x0800
 
@@ -254,4 +260,7 @@ enum {
  * 21.5 AssemblyRefs
  */
 #define ASSEMBLYREF_FULL_PUBLIC_KEY_FLAG      0x00000001
+#define ASSEMBLYREF_RETARGETABLE_FLAG         0x00000100
+#define ASSEMBLYREF_ENABLEJITCOMPILE_TRACKING_FLAG 0x00008000
+#define ASSEMBLYREF_DISABLEJITCOMPILE_OPTIMIZER_FLAG 0x00004000
 #endif