Merged trunk and subtype.

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

diff --git a/src/vm/access.h b/src/vm/access.h
index 2b811f850d673d75796060897be932dd6eab083c..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 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.
 
@@ -19,26 +17,28 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
-
-   Contact: cacao@complang.tuwien.ac.at
-
-   Authors: Edwin Steiner
-
-   Changes:
-
-   $Id: access.h 3451 2005-10-19 22:01:25Z twisti $
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
 */
 
+
 #ifndef _ACCESS_H
 #define _ACCESS_H
 
-#include "vm/types.h"
+#include "config.h"
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "vm/references.h"
 #include "vm/class.h"
+#include "vm/field.hpp"
+#include "vm/global.h"
+#include "vm/method.h"
+
 
 /* macros *********************************************************************/
 
@@ -52,10 +52,20 @@
 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
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _ACCESS_H */
 
+
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where