Merge branch 'upstream'

Former-commit-id: 0a8d9dbe585c0334de822df0c3d0034a95302b4d
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-09-09 07:23:18 +00:00
113 changed files with 1476 additions and 4439 deletions

View File

@@ -93,6 +93,7 @@ GC_API GC_PTR (*GC_oom_fn) GC_PROTO((size_t bytes_requested));
/* pointer to a previously allocated heap */
/* object. */
// Keep somewhat in sync with mono/metadata/profiler.h:enum MonoGCEvent
typedef enum {
GC_EVENT_START,
GC_EVENT_MARK_START,