Merge pull request #1857 from slluis/fix-assembly-resolver

[mono.git] / mono / metadata / object-internals.h

diff --git a/mono/metadata/object-internals.h b/mono/metadata/object-internals.h
index 09582a7b3f25bd63bf6093dda92714b7f1505079..15482c9771dfa19b8570bcbf8fa8bacf15c5c015 100644 (file)
--- a/mono/metadata/object-internals.h
+++ b/mono/metadata/object-internals.h
@@ -395,7 +395,6 @@ struct _MonoInternalThread {
        HANDLE      start_notify;
        gpointer stack_ptr;
        gpointer *static_data;
-       gpointer dead_field_remove_me; /* This used to be jit_data, but that was moved to MonoThreadInfo. */
        void *thread_info; /*This is MonoThreadInfo*, but to simplify dependencies, let's make it a void* here. */
        MonoAppContext *current_appcontext;
        MonoException *pending_exception;
@@ -405,14 +404,9 @@ struct _MonoInternalThread {
        gpointer appdomain_refs;
        /* This is modified using atomic ops, so keep it a gint32 */
        gint32 interruption_requested;
-       gpointer suspend_event;
-       gpointer suspended_event;
-       gpointer resume_event;
        mono_mutex_t *synch_cs;
        MonoBoolean threadpool_thread;
-       MonoBoolean thread_dump_requested;
        MonoBoolean thread_interrupt_requested;
-       gpointer end_stack; /* This is only used when running in the debugger. */
        int stack_size;
        guint8  apartment_state;
        gint32 critical_region_level;
@@ -421,9 +415,7 @@ struct _MonoInternalThread {
        MonoThreadManageCallback manage_callback;
        gpointer interrupt_on_stop;
        gsize    flags;
-       gpointer android_tid;
        gpointer thread_pinning_ref;
-       gint32 ignore_next_signal;
        MonoMethod *async_invoke_method;
        /* 
         * These fields are used to avoid having to increment corlib versions
@@ -439,7 +431,6 @@ struct _MonoThread {
        MonoObject obj;
        struct _MonoInternalThread *internal_thread;
        MonoObject *start_obj;
-       MonoObject *ec_to_set;
 };
 
 typedef struct {
@@ -646,6 +637,9 @@ mono_async_result_new           (MonoDomain *domain, HANDLE handle,
 MonoObject *
 mono_async_result_invoke    (MonoAsyncResult *ares, MonoObject **exc);
 
+MonoObject *
+ves_icall_System_Runtime_Remoting_Messaging_AsyncResult_Invoke (MonoAsyncResult *this);
+
 MonoWaitHandle *
 mono_wait_handle_new       (MonoDomain *domain, HANDLE handle);
 
@@ -801,7 +795,7 @@ struct _MonoDelegate {
 typedef struct _MonoMulticastDelegate MonoMulticastDelegate;
 struct _MonoMulticastDelegate {
        MonoDelegate delegate;
-       MonoMulticastDelegate *prev;
+       MonoArray *delegates;
 };
 
 struct _MonoReflectionField {