This commit introduces C++ wrapper classes for Java heap objects.

[cacao.git] / src / native / vm / gnuclasspath / java_lang_VMString.cpp

diff --git a/src/native/vm/gnuclasspath/java_lang_VMString.cpp b/src/native/vm/gnuclasspath/java_lang_VMString.cpp
index fc4c34ffcaa99082ebf3d2ad61ada9c1cbdecf12..632c429b8fd9ed8ff957a90c5d26788bd3996398 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMString.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_VMString.cpp
@@ -31,12 +31,9 @@
 #include "native/jni.h"
 #include "native/native.h"
 
-#include "native/include/java_lang_String.h"
-
-// FIXME
-extern "C" {
-#include "native/include/java_lang_VMString.h"
-}
+#if defined(ENABLE_JNI_HEADERS)
+# include "native/vm/include/java_lang_VMString.h"
+#endif
 
 #include "vm/string.hpp"
 
@@ -49,12 +46,12 @@ extern "C" {
  * Method:    intern
  * Signature: (Ljava/lang/String;)Ljava/lang/String;
  */
-JNIEXPORT java_lang_String* JNICALL Java_java_lang_VMString_intern(JNIEnv *env, jclass clazz, java_lang_String *str)
+JNIEXPORT jstring JNICALL Java_java_lang_VMString_intern(JNIEnv *env, jclass clazz, jstring str)
 {
        if (str == NULL)
                return NULL;
 
-       return (java_lang_String *) javastring_intern((java_handle_t *) str);
+       return (jstring) javastring_intern((java_handle_t *) str);
 }
 
 } // extern "C"