diff options
| author | Paolo Molaro <lupus@oddwiz.org> | 2010-02-24 19:46:41 +0300 |
|---|---|---|
| committer | Paolo Molaro <lupus@oddwiz.org> | 2010-02-24 19:46:41 +0300 |
| commit | 6935523cbed17600ab04336bd0acffcd6a23228e (patch) | |
| tree | eb5199fa39d7a3fbe6c39f9e1ef0ea86d1107805 | |
| parent | 35d2e67267b1f8a3178338457c6026e16c2c9f4f (diff) | |
Wed Feb 24 17:45:27 CET 2010 Paolo Molaro <lupus@ximian.com>
* class-internals.h, class.h, object.h: make MonoRemoteClass
and mono_remote_class() internal.
svn path=/trunk/mono/; revision=152373
| -rw-r--r-- | mono/metadata/ChangeLog | 5 | ||||
| -rw-r--r-- | mono/metadata/class-internals.h | 14 | ||||
| -rw-r--r-- | mono/metadata/class.h | 11 | ||||
| -rw-r--r-- | mono/metadata/object.h | 3 |
4 files changed, 19 insertions, 14 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 6822678f270..73a2962909f 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,4 +1,9 @@ +Wed Feb 24 17:45:27 CET 2010 Paolo Molaro <lupus@ximian.com> + + * class-internals.h, class.h, object.h: make MonoRemoteClass + and mono_remote_class() internal. + Wed Feb 24 17:05:18 CET 2010 Paolo Molaro <lupus@ximian.com> * metadata-internals.h, class-internals.h, metadata.h: make the diff --git a/mono/metadata/class-internals.h b/mono/metadata/class-internals.h index 6ff95e601a8..d73f382a88f 100644 --- a/mono/metadata/class-internals.h +++ b/mono/metadata/class-internals.h @@ -639,6 +639,20 @@ typedef struct { #define mono_class_has_parent(klass,parent) (((klass)->idepth >= (parent)->idepth) && ((klass)->supertypes [(parent)->idepth - 1] == (parent))) typedef struct { + MonoVTable *default_vtable; + MonoVTable *xdomain_vtable; + MonoClass *proxy_class; + char* proxy_class_name; + uint32_t interface_count; + MonoClass *interfaces [MONO_ZERO_LEN_ARRAY]; +} MonoRemoteClass; + +#define MONO_SIZEOF_REMOTE_CLASS (sizeof (MonoRemoteClass) - MONO_ZERO_LEN_ARRAY * SIZEOF_VOID_P) + +MonoRemoteClass* +mono_remote_class (MonoDomain *domain, MonoString *class_name, MonoClass *proxy_class) MONO_INTERNAL; + +typedef struct { gulong new_object_count; gulong initialized_class_count; gulong generic_vtable_count; diff --git a/mono/metadata/class.h b/mono/metadata/class.h index 311838c4c65..1142dca5bdf 100644 --- a/mono/metadata/class.h +++ b/mono/metadata/class.h @@ -13,17 +13,6 @@ typedef struct _MonoClassField MonoClassField; typedef struct _MonoProperty MonoProperty; typedef struct _MonoEvent MonoEvent; -typedef struct { - MonoVTable *default_vtable; - MonoVTable *xdomain_vtable; - MonoClass *proxy_class; - char* proxy_class_name; - uint32_t interface_count; - MonoClass *interfaces [MONO_ZERO_LEN_ARRAY]; -} MonoRemoteClass; - -#define MONO_SIZEOF_REMOTE_CLASS (sizeof (MonoRemoteClass) - MONO_ZERO_LEN_ARRAY * SIZEOF_VOID_P) - MonoClass * mono_class_get (MonoImage *image, uint32_t type_token); diff --git a/mono/metadata/object.h b/mono/metadata/object.h index f4d59dd9754..ee21889f365 100644 --- a/mono/metadata/object.h +++ b/mono/metadata/object.h @@ -283,9 +283,6 @@ mono_print_unhandled_exception (MonoObject *exc); void* mono_compile_method (MonoMethod *method); -MonoRemoteClass* -mono_remote_class (MonoDomain *domain, MonoString *class_name, MonoClass *proxy_class); - /* accessors for fields and properties */ void mono_field_set_value (MonoObject *obj, MonoClassField *field, void *value); |