* src/vm/jit/oprofile-agent.cpp: Set source formatting to c++.

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

diff --git a/src/vmcore/utf8.c b/src/vmcore/utf8.c
index 9cb1f1109dbb7d292c32b3f63efb6d1cdf7e2abd..fcb453d1a8ba32771dd8ffe2f163c762d42a8693 100644 (file)
--- a/src/vmcore/utf8.c
+++ b/src/vmcore/utf8.c
@@ -36,7 +36,7 @@
 
 #include "toolbox/hashtable.h"
 
-#include "vm/exceptions.h"
+#include "vm/exceptions.hpp"
 
 #include "vmcore/options.h"
 
@@ -132,7 +132,7 @@ utf *utf_java_lang_reflect_Constructor;
 utf *utf_java_lang_reflect_Field;
 utf *utf_java_lang_reflect_Method;
 
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 utf *utf_java_lang_reflect_VMConstructor;
 utf *utf_java_lang_reflect_VMField;
 utf *utf_java_lang_reflect_VMMethod;
@@ -171,6 +171,7 @@ utf *utf_main;
 utf *utf_run;                           /* run                                */
 
 utf *utf_add;
+utf *utf_dispatch;
 utf *utf_remove;
 utf *utf_addThread;
 utf *utf_removeThread;
@@ -393,7 +394,7 @@ void utf8_init(void)
        utf_java_lang_reflect_Field    = utf_new_char("java/lang/reflect/Field");
        utf_java_lang_reflect_Method   = utf_new_char("java/lang/reflect/Method");
 
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
        utf_java_lang_reflect_VMConstructor = utf_new_char("java/lang/reflect/VMConstructor");
        utf_java_lang_reflect_VMField       = utf_new_char("java/lang/reflect/VMField");
        utf_java_lang_reflect_VMMethod      = utf_new_char("java/lang/reflect/VMMethod");
@@ -432,6 +433,7 @@ void utf8_init(void)
        utf_run                        = utf_new_char("run");
 
        utf_add                        = utf_new_char("add");
+       utf_dispatch                   = utf_new_char("dispatch");
        utf_remove                     = utf_new_char("remove");
        utf_addThread                  = utf_new_char("addThread");
        utf_removeThread               = utf_new_char("removeThread");