X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fexception.h;h=beb508a6a91d4e8113d602a91650e5675f9f5454;hb=d6cdd9715eff6eeac53c9d0970a90e49b7c80edd;hp=ab75566a0ac66fc67b4d333a0b2ed8722a0adc37;hpb=04d1b4116331e3813b8f75304f714a5d61ba1214;p=mono.git

diff --git a/mono/metadata/exception.h b/mono/metadata/exception.h
index ab75566a0ac..beb508a6a91 100644
--- a/mono/metadata/exception.h
+++ b/mono/metadata/exception.h
@@ -7,7 +7,7 @@
 #include <mono/metadata/object.h>
 #include <mono/metadata/image.h>
 
-G_BEGIN_DECLS
+MONO_BEGIN_DECLS
 
 extern MonoException *
 mono_exception_from_name               (MonoImage *image, 
@@ -15,7 +15,7 @@ mono_exception_from_name               (MonoImage *image,
 					const char *name);
 
 MonoException *
-mono_exception_from_token              (MonoImage *image, guint32 token);
+mono_exception_from_token              (MonoImage *image, uint32_t token);
 
 MonoException *
 mono_exception_from_name_two_strings (MonoImage *image, const char *name_space,
@@ -25,6 +25,10 @@ MonoException *
 mono_exception_from_name_msg	       (MonoImage *image, const char *name_space,
 					const char *name, const char *msg);
 
+MonoException *
+mono_exception_from_token_two_strings (MonoImage *image, uint32_t token,
+						   MonoString *a1, MonoString *a2);
+
 extern MonoException *
 mono_exception_from_name_domain        (MonoDomain *domain, MonoImage *image, 
 					const char* name_space, 
@@ -54,6 +58,9 @@ mono_get_exception_thread_abort        (void);
 MonoException *
 mono_get_exception_thread_state        (const char *msg);
 
+MonoException *
+mono_get_exception_thread_interrupted  (void);
+
 MonoException *
 mono_get_exception_serialization       (const char *msg);
 
@@ -103,7 +110,7 @@ MonoException *
 mono_get_exception_file_not_found2       (const char *msg, MonoString *fname);
 
 MonoException *
-mono_get_exception_type_initialization (const gchar *type_name, MonoException *inner);
+mono_get_exception_type_initialization (const char *type_name, MonoException *inner);
 
 MonoException *
 mono_get_exception_synchronization_lock (const char *msg);
@@ -117,12 +124,24 @@ mono_get_exception_appdomain_unloaded (void);
 MonoException *
 mono_get_exception_bad_image_format (const char *msg);
 
+MonoException *
+mono_get_exception_bad_image_format2 (const char *msg, MonoString *fname);
+
 MonoException *
 mono_get_exception_stack_overflow (void);
 
+MonoException *
+mono_get_exception_out_of_memory (void);
+
+MonoException *
+mono_get_exception_field_access (void);
+
+MonoException *
+mono_get_exception_method_access (void);
+
 MonoException *
 mono_get_exception_reflection_type_load (MonoArray *types, MonoArray *exceptions);
 
-G_END_DECLS
+MONO_END_DECLS
 
 #endif /* _MONO_METADATA_EXCEPTION_H_ */