X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Floader.h;h=0f2621e036f78e70e0c054659d196d4138a26a0a;hb=6bfa515a20e44f5a164d076d9c583f29adcbe3e0;hp=d894e9bdac8886bdbca2ac24ee57934d02dd2053;hpb=0649b90c407fc29ee8377f2c6fb42ae2c006e26a;p=mono.git

diff --git a/mono/metadata/loader.h b/mono/metadata/loader.h
index d894e9bdac8..0f2621e036f 100644
--- a/mono/metadata/loader.h
+++ b/mono/metadata/loader.h
@@ -4,29 +4,30 @@
 #include <mono/metadata/metadata.h>
 #include <mono/metadata/image.h>
 
-G_BEGIN_DECLS
+MONO_BEGIN_DECLS
 
-typedef struct _MonoMethod MonoMethod;
-
-typedef gboolean (*MonoStackWalk)     (MonoMethod *method, gint32 native_offset, gint32 il_offset, gboolean managed, gpointer data);
+typedef mono_bool (*MonoStackWalk)     (MonoMethod *method, int32_t native_offset, int32_t il_offset, mono_bool managed, void* data);
 
 MonoMethod *
-mono_get_method            (MonoImage *image, guint32 token, MonoClass *klass);
+mono_get_method             (MonoImage *image, uint32_t token, MonoClass *klass);
 
 MonoMethod *
-mono_get_method_full       (MonoImage *image, guint32 token, MonoClass *klass, MonoGenericContext *context);
+mono_get_method_full        (MonoImage *image, uint32_t token, MonoClass *klass,
+			     MonoGenericContext *context);
 
 MonoMethod *
-mono_get_method_constrained (MonoImage *image, guint32 token, MonoClass *constrained_class, MonoGenericContext *context);
+mono_get_method_constrained (MonoImage *image, uint32_t token, MonoClass *constrained_class,
+			     MonoGenericContext *context, MonoMethod **cil_method);
 
 void               
 mono_free_method           (MonoMethod *method);
 
 MonoMethodSignature*
-mono_method_get_signature_full (MonoMethod *method, MonoImage *image, guint32 token, MonoGenericContext *context);
+mono_method_get_signature_full (MonoMethod *method, MonoImage *image, uint32_t token,
+				MonoGenericContext *context);
 
 MonoMethodSignature* 
-mono_method_get_signature  (MonoMethod *method, MonoImage *image, guint32 token);
+mono_method_get_signature  (MonoMethod *method, MonoImage *image, uint32_t token);
 
 MonoMethodSignature* 
 mono_method_signature      (MonoMethod *method);
@@ -40,53 +41,53 @@ mono_method_get_name       (MonoMethod *method);
 MonoClass*
 mono_method_get_class      (MonoMethod *method);
 
-guint32
+uint32_t
 mono_method_get_token      (MonoMethod *method);
 
-guint32
-mono_method_get_flags      (MonoMethod *method, guint32 *iflags);
+uint32_t
+mono_method_get_flags      (MonoMethod *method, uint32_t *iflags);
 
-guint32
+uint32_t
 mono_method_get_index      (MonoMethod *method);
 
 MonoImage *
 mono_load_image            (const char *fname, MonoImageOpenStatus *status);
 
 void
-mono_add_internal_call     (const char *name, gconstpointer method);
+mono_add_internal_call     (const char *name, const void* method);
 
-gpointer
+void*
 mono_lookup_internal_call (MonoMethod *method);
 
 void
 mono_dllmap_insert (MonoImage *assembly, const char *dll, const char *func, const char *tdll, const char *tfunc);
 
-gpointer
+void*
 mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char **exc_arg);
 
 void
 mono_method_get_param_names (MonoMethod *method, const char **names);
 
-guint32
+uint32_t
 mono_method_get_param_token (MonoMethod *method, int idx);
 
 void
 mono_method_get_marshal_info (MonoMethod *method, MonoMarshalSpec **mspecs);
 
-gboolean
+mono_bool
 mono_method_has_marshal_info (MonoMethod *method);
 
 MonoMethod*
 mono_method_get_last_managed  (void);
 
 void
-mono_stack_walk         (MonoStackWalk func, gpointer user_data);
+mono_stack_walk         (MonoStackWalk func, void* user_data);
 
 /* Use this if the IL offset is not needed: it's faster */
 void
-mono_stack_walk_no_il   (MonoStackWalk func, gpointer user_data);
+mono_stack_walk_no_il   (MonoStackWalk func, void* user_data);
 
-G_END_DECLS
+MONO_END_DECLS
 
 #endif