Revert "Merge branch 'master' of https://github.com/mono/mono"

[mono.git] / mono / mini / declsec.h

diff --git a/mono/mini/declsec.h b/mono/mini/declsec.h
index 12d685bd27cf67cdcad4ee2c45fc5db2fec5b46f..fa9db61c8b0648b67e88956bc1dc6bcef43f7ae6 100644 (file)
--- a/mono/mini/declsec.h
+++ b/mono/mini/declsec.h
@@ -19,14 +19,11 @@
 #include "mono/metadata/marshal.h"
 #include "mono/metadata/security-manager.h"
 #include "mono/metadata/exception.h"
+#include "mono/utils/mono-compiler.h"
 
 
 /* Definitions */
 
-#define MONO_SECMAN_FLAG_INIT(x)               (x & 0x2)
-#define MONO_SECMAN_FLAG_GET_VALUE(x)          (x & 0x1)
-#define MONO_SECMAN_FLAG_SET_VALUE(x,y)                do { x = ((y) ? 0x3 : 0x2); } while (0)
-
 #define        MONO_CAS_INITIAL_STACK_SIZE             6
 
 
@@ -57,10 +54,16 @@ enum {
 };
 
 /* Prototypes */
-MonoBoolean mono_method_has_declsec (MonoMethod *method);
-void mono_declsec_cache_stack_modifiers (MonoJitInfo *jinfo);
-MonoSecurityFrame* mono_declsec_create_frame (MonoDomain *domain, MonoJitInfo *jinfo);
+MonoBoolean mono_method_has_declsec (MonoMethod *method) MONO_INTERNAL;
+void mono_declsec_cache_stack_modifiers (MonoJitInfo *jinfo) MONO_INTERNAL;
+MonoSecurityFrame* mono_declsec_create_frame (MonoDomain *domain, MonoJitInfo *jinfo) MONO_INTERNAL;
+
+guint32 mono_declsec_linkdemand (MonoDomain *domain, MonoMethod *caller, MonoMethod *callee) MONO_INTERNAL;
 
-guint32 mono_declsec_linkdemand (MonoDomain *domain, MonoMethod *caller, MonoMethod *callee);
+#ifndef DISABLE_SECURITY
+#define mono_security_method_has_declsec(method) (mono_method_has_declsec(method))
+#else
+#define mono_security_method_has_declsec(method) (FALSE)
+#endif
 
 #endif /* _MONO_MINI_DECLSEC_H_ */