* src/native/jni.cpp: [OPENJDK] Fix FindClass called from JNI_OnLoad.

[cacao.git] / src / vm / utf8.c

diff --git a/src/vm/utf8.c b/src/vm/utf8.c
index 1d7d7605fae6a4565acb47c69aabb3e3eb8c4479..fe2099d0298474e6e595b6fef67a2c0e840e82ca 100644 (file)
--- a/src/vm/utf8.c
+++ b/src/vm/utf8.c
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/mutex.hpp"
 
@@ -61,6 +61,7 @@ utf *utf_java_lang_Object;
 
 utf *utf_java_lang_Class;
 utf *utf_java_lang_ClassLoader;
+utf *utf_java_lang_ClassLoader_NativeLibrary;
 utf *utf_java_lang_Cloneable;
 utf *utf_java_lang_SecurityManager;
 utf *utf_java_lang_String;
@@ -152,13 +153,17 @@ utf *utf_EnclosingMethod;
 utf *utf_Signature;
 utf *utf_StackMapTable;
 
-#if defined(ENABLE_ANNOTATIONS)
+# if defined(ENABLE_JVMTI)
+utf *utf_LocalVariableTable;
+# endif
+
+# if defined(ENABLE_ANNOTATIONS)
 utf *utf_RuntimeVisibleAnnotations;            /* RuntimeVisibleAnnotations            */
 utf *utf_RuntimeInvisibleAnnotations;          /* RuntimeInvisibleAnnotations          */
 utf *utf_RuntimeVisibleParameterAnnotations;   /* RuntimeVisibleParameterAnnotations   */
 utf *utf_RuntimeInvisibleParameterAnnotations; /* RuntimeInvisibleParameterAnnotations */
 utf *utf_AnnotationDefault;                    /* AnnotationDefault                    */
-#endif
+# endif
 #endif
 
 utf *utf_init;                          /* <init>                             */
@@ -259,6 +264,9 @@ void utf8_init(void)
        utf_java_lang_String           = utf_new_char("java/lang/String");
        utf_java_lang_ThreadGroup      = utf_new_char("java/lang/ThreadGroup");
 
+       utf_java_lang_ClassLoader_NativeLibrary =
+               utf_new_char("java/lang/ClassLoader$NativeLibrary");
+
        utf_java_lang_ref_SoftReference =
                utf_new_char("java/lang/ref/SoftReference");
 
@@ -414,6 +422,10 @@ void utf8_init(void)
        utf_Signature                  = utf_new_char("Signature");
        utf_StackMapTable              = utf_new_char("StackMapTable");
 
+# if defined(ENABLE_JVMTI)
+       utf_LocalVariableTable         = utf_new_char("LocalVariableTable");
+# endif
+
 # if defined(ENABLE_ANNOTATIONS)
        utf_RuntimeVisibleAnnotations            = utf_new_char("RuntimeVisibleAnnotations");
        utf_RuntimeInvisibleAnnotations          = utf_new_char("RuntimeInvisibleAnnotations");