Merged trunk and subtype.

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

diff --git a/src/vm/access.h b/src/vm/access.h
index 2b8a10c173e93251be7fcfac22854e49a6c16f0a..0b1def4768f6d0bdea16729c653131b0d8031af4 100644 (file)
--- a/src/vm/access.h
+++ b/src/vm/access.h
@@ -30,11 +30,14 @@
 
 #include <stdint.h>
 
-#include "vm/global.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 *********************************************************************/
@@ -56,6 +59,10 @@ bool access_check_field(fieldinfo *f, int callerdepth);
 bool access_check_method(methodinfo *m, int callerdepth);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ACCESS_H */