Merged trunk and subtype.

[cacao.git] / src / vm / access.h

diff --git a/src/vm/access.h b/src/vm/access.h
index 4197126f8ae758da42035772ae3726725d32e409..0b1def4768f6d0bdea16729c653131b0d8031af4 100644 (file)
--- a/src/vm/access.h
+++ b/src/vm/access.h
@@ -1,9 +1,7 @@
 /* src/vm/access.h - checking access rights
 
-   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -29,13 +27,17 @@
 #define _ACCESS_H
 
 #include "config.h"
-#include "vm/types.h"
 
-#include "vm/global.h"
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "vmcore/class.h"
-#include "vmcore/field.h"
-#include "vmcore/method.h"
+#include "vm/class.h"
+#include "vm/field.hpp"
+#include "vm/global.h"
+#include "vm/method.h"
 
 
 /* macros *********************************************************************/
@@ -50,10 +52,16 @@
 bool access_is_accessible_class(classinfo *referer, classinfo *cls);
 
 bool access_is_accessible_member(classinfo *referer, classinfo *declarer,
-                                                                s4 memberflags);
+                                                                int32_t memberflags);
+
+#if defined(ENABLE_JAVASE)
+bool access_check_field(fieldinfo *f, int callerdepth);
+bool access_check_method(methodinfo *m, int callerdepth);
+#endif
 
-bool access_check_field(fieldinfo *f, s4 calldepth);
-bool access_check_method(methodinfo *m, s4 calldepth);
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _ACCESS_H */