#include <stdint.h>
-#include "native/jni.h"
+#include "native/jni.hpp"
#include "native/llni.h"
-#include "native/native.h"
+#include "native/native.hpp"
-// FIXME
-//#include "native/include/java_lang_VMClass.h"
+#if defined(ENABLE_JNI_HEADERS)
+# include "native/vm/include/java_lang_VMClass.h"
+#endif
+#include "vm/class.hpp"
#include "vm/exceptions.hpp"
-#include "vm/initialize.h"
+#include "vm/globals.hpp"
+#include "vm/initialize.hpp"
+#include "vm/javaobjects.hpp"
#include "vm/string.hpp"
-#include "vmcore/class.h"
-#include "vmcore/globals.hpp"
-#include "vmcore/javaobjects.hpp"
-
#if defined(ENABLE_ANNOTATIONS)
+#include "vm/annotation.h"
#include "vm/vm.hpp"
-
-#include "vmcore/annotation.h"
#endif
*******************************************************************************/
-// FIXME
-extern "C" {
void _Jv_java_lang_VMClass_init(void)
{
- utf *u;
-
- u = utf_new_char("java/lang/VMClass");
+ utf* u = utf_new_char("java/lang/VMClass");
- native_method_register(u, methods, NATIVE_METHODS_COUNT);
-}
+ NativeMethods& nm = VM::get_current()->get_nativemethods();
+ nm.register_methods(u, methods, NATIVE_METHODS_COUNT);
}