Added MonoString<->UTF-32 conversion helper functions.

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

diff --git a/mono/metadata/marshal.h b/mono/metadata/marshal.h
index 22db7a6b330d99e3f068e5cc47dc9d213bc35b70..0c311c889336b0c290425de7a342617e9d57ab31 100644 (file)
--- a/mono/metadata/marshal.h
+++ b/mono/metadata/marshal.h
@@ -104,13 +104,17 @@ typedef enum {
        /* Subtypes of MONO_WRAPPER_MANAGED_TO_NATIVE */
        WRAPPER_SUBTYPE_ICALL_WRAPPER,
        WRAPPER_SUBTYPE_NATIVE_FUNC_AOT,
+       WRAPPER_SUBTYPE_PINVOKE,
        /* Subtypes of MONO_WRAPPER_UNKNOWN */
        WRAPPER_SUBTYPE_SYNCHRONIZED_INNER,
        WRAPPER_SUBTYPE_GSHAREDVT_IN,
        WRAPPER_SUBTYPE_GSHAREDVT_OUT,
        WRAPPER_SUBTYPE_ARRAY_ACCESSOR,
        /* Subtypes of MONO_WRAPPER_MANAGED_TO_MANAGED */
-       WRAPPER_SUBTYPE_GENERIC_ARRAY_HELPER
+       WRAPPER_SUBTYPE_GENERIC_ARRAY_HELPER,
+       /* Subtypes of MONO_WRAPPER_DELEGATE_INVOKE */
+       WRAPPER_SUBTYPE_DELEGATE_INVOKE_VIRTUAL,
+       WRAPPER_SUBTYPE_DELEGATE_INVOKE_BOUND
 } WrapperSubtype;
 
 typedef struct {
@@ -190,7 +194,7 @@ typedef struct {
 G_BEGIN_DECLS
 
 /*type of the function pointer of methods returned by mono_marshal_get_runtime_invoke*/
-typedef MonoObject *(*RuntimeInvokeFunction) (MonoObject *this, void **params, MonoObject **exc, void* compiled_method);
+typedef MonoObject *(*RuntimeInvokeFunction) (MonoObject *this_obj, void **params, MonoObject **exc, void* compiled_method);
 
 typedef void (*RuntimeInvokeDynamicFunction) (void *args, MonoObject **exc, void* compiled_method);
 
@@ -295,7 +299,7 @@ MonoMethod *
 mono_marshal_get_delegate_invoke (MonoMethod *method, MonoDelegate *del) MONO_INTERNAL;
 
 MonoMethod *
-mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual) MONO_INTERNAL;
+mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean is_virtual) MONO_INTERNAL;
 
 MonoMethod*
 mono_marshal_get_runtime_invoke_dynamic (void) MONO_INTERNAL;
@@ -364,7 +368,7 @@ MonoMethod *
 mono_marshal_get_array_accessor_wrapper (MonoMethod *method) MONO_INTERNAL;
 
 MonoMethod *
-mono_marshal_get_generic_array_helper (MonoClass *class, MonoClass *iface,
+mono_marshal_get_generic_array_helper (MonoClass *klass, MonoClass *iface,
                                       gchar *name, MonoMethod *method) MONO_INTERNAL;
 
 MonoMethod *