grammar updates

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

diff --git a/mono/metadata/object.h b/mono/metadata/object.h
index af939c47fa9cd15b0ca1a41971ac38dd39e74d7c..17d0322c236a82d88f245cfd75f2f6d9790ede4b 100644 (file)
--- a/mono/metadata/object.h
+++ b/mono/metadata/object.h
@@ -125,6 +125,7 @@ typedef struct {
 typedef struct {
        MonoType *type;
        gpointer  value;
+       MonoClass *klass;
 } MonoTypedRef;
 
 typedef struct {
@@ -161,6 +162,12 @@ typedef struct {
        MonoString *param_name;
 } MonoArgumentException;
 
+typedef struct {
+       MonoSystemException base;
+       MonoString *msg;
+       MonoString *type_name;
+} MonoTypeLoadException;
+
 typedef struct {
        MonoObject   object;
        MonoObject  *async_state;
@@ -191,6 +198,14 @@ typedef struct {
        MonoClass     *klass; 
 } MonoTransparentProxy;
 
+/* This is a copy of System.Runtime.Remoting.Messaging.CallType */
+typedef enum {
+       CallType_Sync = 0,
+       CallType_BeginInvoke = 1,
+       CallType_EndInvoke = 2,
+       CallType_OneWay = 3
+} MonoCallType;
+
 typedef struct {
        MonoObject obj;
        MonoReflectionMethod *method;
@@ -200,6 +215,8 @@ typedef struct {
        MonoObject *ctx;
        MonoObject *rval;
        MonoObject *exc;
+       MonoAsyncResult *async_result;
+       guint32     call_type;
 } MonoMethodMessage;
 
 typedef struct {
@@ -224,6 +241,9 @@ typedef struct {
        HANDLE      start_notify;
        gpointer stack_ptr;
        gpointer *static_data;
+       gpointer jit_data;
+       gpointer lock_data;
+       GSList *appdomain_refs;
 } MonoThread;
 
 typedef struct {
@@ -339,7 +359,7 @@ typedef void (*MonoExceptionFunc) (MonoException *ex);
 void
 mono_install_handler        (MonoExceptionFunc func);
 
-G_GNUC_NORETURN void
+void
 mono_raise_exception        (MonoException *ex);
 
 void