Merge pull request #2720 from mono/fix-39325

[mono.git] / mono / metadata / security-core-clr.h

diff --git a/mono/metadata/security-core-clr.h b/mono/metadata/security-core-clr.h
index 126a48da2c75810b374ade2ef2064f9030df4ee4..51fdb8c1239eedc47904a1389ce8c3e92b69daaf 100644 (file)
--- a/mono/metadata/security-core-clr.h
+++ b/mono/metadata/security-core-clr.h
@@ -10,7 +10,9 @@
 #ifndef _MONO_METADATA_SECURITY_CORE_CLR_H_
 #define _MONO_METADATA_SECURITY_CORE_CLR_H_
 
+#include <glib.h>
 #include <mono/metadata/reflection.h>
+#include <mono/utils/mono-compiler.h>
 
 typedef enum {
        /* We compare these values as integers, so the order must not
@@ -37,24 +39,27 @@ typedef enum {
 
 extern gboolean mono_security_core_clr_test;
 
-extern void mono_security_core_clr_check_inheritance (MonoClass *class) MONO_INTERNAL;
-extern void mono_security_core_clr_check_override (MonoClass *class, MonoMethod *override, MonoMethod *base) MONO_INTERNAL;
+extern void mono_security_core_clr_check_inheritance (MonoClass *klass);
+extern void mono_security_core_clr_check_override (MonoClass *klass, MonoMethod *override, MonoMethod *base);
 
-extern void mono_security_core_clr_ensure_reflection_access_field (MonoClassField *field) MONO_INTERNAL;
-extern void mono_security_core_clr_ensure_reflection_access_method (MonoMethod *method) MONO_INTERNAL;
-extern gboolean mono_security_core_clr_ensure_delegate_creation (MonoMethod *method, gboolean throwOnBindFailure) MONO_INTERNAL;
-extern MonoException* mono_security_core_clr_ensure_dynamic_method_resolved_object (gpointer ref, MonoClass *handle_class) MONO_INTERNAL;
+extern gboolean
+mono_security_core_clr_ensure_reflection_access_field (MonoClassField *field, MonoError *error);
+extern gboolean
+mono_security_core_clr_ensure_reflection_access_method (MonoMethod *method, MonoError *error);
+extern gboolean mono_security_core_clr_ensure_delegate_creation (MonoMethod *method, MonoError *error);
+extern MonoException* mono_security_core_clr_ensure_dynamic_method_resolved_object (gpointer ref, MonoClass *handle_class);
 
-extern gboolean mono_security_core_clr_can_access_internals (MonoImage *accessing, MonoImage* accessed) MONO_INTERNAL;
+extern gboolean mono_security_core_clr_can_access_internals (MonoImage *accessing, MonoImage* accessed);
 
-extern MonoException* mono_security_core_clr_is_field_access_allowed (MonoMethod *caller, MonoClassField *field) MONO_INTERNAL;
-extern MonoException* mono_security_core_clr_is_call_allowed (MonoMethod *caller, MonoMethod *callee) MONO_INTERNAL;
+extern MonoException* mono_security_core_clr_is_field_access_allowed (MonoMethod *caller, MonoClassField *field);
+extern MonoException* mono_security_core_clr_is_call_allowed (MonoMethod *caller, MonoMethod *callee);
 
-extern MonoSecurityCoreCLRLevel mono_security_core_clr_class_level (MonoClass *class) MONO_INTERNAL;
-extern MonoSecurityCoreCLRLevel mono_security_core_clr_method_level (MonoMethod *method, gboolean with_class_level) MONO_INTERNAL;
+extern MonoSecurityCoreCLRLevel mono_security_core_clr_class_level (MonoClass *klass);
+extern MonoSecurityCoreCLRLevel mono_security_core_clr_field_level (MonoClassField *field, gboolean with_class_level);
+extern MonoSecurityCoreCLRLevel mono_security_core_clr_method_level (MonoMethod *method, gboolean with_class_level);
 
-extern gboolean mono_security_core_clr_is_platform_image (MonoImage *image) MONO_INTERNAL;
-extern gboolean mono_security_core_clr_determine_platform_image (MonoImage *image) MONO_INTERNAL;
+extern gboolean mono_security_core_clr_is_platform_image (MonoImage *image);
+extern gboolean mono_security_core_clr_determine_platform_image (MonoImage *image);
 
 extern MONO_API gboolean mono_security_core_clr_require_elevated_permissions (void);