X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fappdomain.h;h=282d3e52d3bad084a161140ab2a78e9cb8b4bfdc;hb=dac383857be2fdd09b7b6bbede60e4d1073f47f7;hp=7fc842fb046b84da702b63a2e2d9ef36c51ffd2a;hpb=dbf19eb41dbd299c4c33d4de35ffe3cf6c669832;p=mono.git

diff --git a/mono/metadata/appdomain.h b/mono/metadata/appdomain.h
index 7fc842fb046..282d3e52d3b 100644
--- a/mono/metadata/appdomain.h
+++ b/mono/metadata/appdomain.h
@@ -10,22 +10,21 @@
 #ifndef _MONO_METADATA_APPDOMAIN_H_
 #define _MONO_METADATA_APPDOMAIN_H_
 
-#include <glib.h>
+#include <mono/utils/mono-publib.h>
 
 #include <mono/metadata/object.h>
 #include <mono/metadata/reflection.h>
-#include <mono/metadata/mempool.h>
 
-G_BEGIN_DECLS
+MONO_BEGIN_DECLS
 
-typedef void (*MonoThreadStartCB) (gsize tid, gpointer stack_start,
-				   gpointer func);
-typedef void (*MonoThreadAttachCB) (gsize tid, gpointer stack_start);
+typedef void (*MonoThreadStartCB) (intptr_t tid, void* stack_start,
+				   void* func);
+typedef void (*MonoThreadAttachCB) (intptr_t tid, void* stack_start);
 
 typedef struct _MonoAppDomain MonoAppDomain;
 typedef struct _MonoJitInfo MonoJitInfo;
 
-typedef void (*MonoDomainFunc) (MonoDomain *domain, gpointer user_data);
+typedef void (*MonoDomainFunc) (MonoDomain *domain, void* user_data);
 
 MonoDomain*
 mono_init                  (const char *filename);
@@ -55,7 +54,7 @@ mono_runtime_quit (void);
 void
 mono_runtime_set_shutting_down (void);
 
-gboolean
+mono_bool
 mono_runtime_is_shutting_down (void);
 
 const char*
@@ -64,44 +63,56 @@ mono_check_corlib_version (void);
 MonoDomain *
 mono_domain_create         (void);
 
+MonoDomain *
+mono_domain_create_appdomain (char *friendly_name, char *configuration_file);
+
 MonoDomain *
 mono_domain_get            (void);
 
 MonoDomain *
-mono_domain_get_by_id      (gint32 domainid);
+mono_domain_get_by_id      (int32_t domainid);
 
-gint32
+int32_t
 mono_domain_get_id         (MonoDomain *domain);
 
-gboolean
-mono_domain_set            (MonoDomain *domain, gboolean force);
+mono_bool
+mono_domain_set            (MonoDomain *domain, mono_bool force);
 
 void
 mono_domain_set_internal   (MonoDomain *domain);
 
-gboolean
+void
+mono_domain_unload (MonoDomain *domain);
+
+void
+mono_domain_try_unload (MonoDomain *domain, MonoObject **exc);
+
+mono_bool
 mono_domain_is_unloading   (MonoDomain *domain);
 
+MonoDomain *
+mono_domain_from_appdomain (MonoAppDomain *appdomain);
+
 void
-mono_domain_foreach        (MonoDomainFunc func, gpointer user_data);
+mono_domain_foreach        (MonoDomainFunc func, void* user_data);
 
 MonoAssembly *
 mono_domain_assembly_open  (MonoDomain *domain, const char *name);
 
-gboolean
-mono_domain_finalize       (MonoDomain *domain, guint32 timeout);
+mono_bool
+mono_domain_finalize       (MonoDomain *domain, uint32_t timeout);
 
 void
-mono_domain_free           (MonoDomain *domain, gboolean force);
+mono_domain_free           (MonoDomain *domain, mono_bool force);
 
-gboolean
+mono_bool
 mono_domain_has_type_resolve (MonoDomain *domain);
 
 MonoReflectionAssembly *
 mono_domain_try_type_resolve (MonoDomain *domain, char *name, MonoObject *tb);
 
-gboolean
-mono_domain_owns_vtable_slot (MonoDomain *domain, gpointer vtable_slot);
+mono_bool
+mono_domain_owns_vtable_slot (MonoDomain *domain, void* vtable_slot);
 
 void
 mono_context_init 				   (MonoDomain *domain);
@@ -117,7 +128,7 @@ mono_jit_info_table_find   (MonoDomain *domain, char *addr);
 
 /* MonoJitInfo accessors */
 
-gpointer
+void*
 mono_jit_info_get_code_start (MonoJitInfo* ji);
 
 int
@@ -193,6 +204,15 @@ mono_get_thread_class       (void);
 MonoClass*
 mono_get_exception_class    (void);
 
-G_END_DECLS
+void
+mono_security_enable_core_clr (void);
+
+typedef mono_bool (*MonoCoreClrPlatformCB) (const char *image_name);
+
+void
+mono_security_set_core_clr_platform_callback (MonoCoreClrPlatformCB callback);
+
+MONO_END_DECLS
+
 #endif /* _MONO_METADATA_APPDOMAIN_H_ */