projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 d90ab84e13074b210669d2aa739d47ccf165cf1d..fa9db61c8b0648b67e88956bc1dc6bcef43f7ae6 100644
(file)
--- a/
mono/mini/declsec.h
+++ b/
mono/mini/declsec.h
@@
-24,10
+24,6
@@
/* Definitions */
/* 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
#define MONO_CAS_INITIAL_STACK_SIZE 6
@@
-64,4
+60,10
@@
MonoSecurityFrame* mono_declsec_create_frame (MonoDomain *domain, MonoJitInfo *j
guint32 mono_declsec_linkdemand (MonoDomain *domain, MonoMethod *caller, MonoMethod *callee) MONO_INTERNAL;
guint32 mono_declsec_linkdemand (MonoDomain *domain, MonoMethod *caller, MonoMethod *callee) MONO_INTERNAL;
+#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_ */
#endif /* _MONO_MINI_DECLSEC_H_ */