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

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

diff --git a/src/native/vm/gnuclasspath/gnu_classpath_VMSystemProperties.cpp b/src/native/vm/gnuclasspath/gnu_classpath_VMSystemProperties.cpp
index 802cfad945b5a8331c32d665df5801822ae739f2..ebd09b0405add9fc83ff1e051b5bda6e41ac685f 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_classpath_VMSystemProperties.cpp
+++ b/src/native/vm/gnuclasspath/gnu_classpath_VMSystemProperties.cpp
@@ -35,12 +35,9 @@
 #include "native/jni.h"
 #include "native/native.h"
 
-#include "native/include/java_util_Properties.h"
-
-/// FIXME
-extern "C" {
-#include "native/include/gnu_classpath_VMSystemProperties.h"
-}
+#if defined(ENABLE_JNI_HEADERS)
+# include "native/include/gnu_classpath_VMSystemProperties.h"
+#endif
 
 #include "vm/exceptions.hpp"
 #include "vm/properties.h"
@@ -55,7 +52,7 @@ extern "C" {
  * Method:    preInit
  * Signature: (Ljava/util/Properties;)V
  */
-JNIEXPORT void JNICALL Java_gnu_classpath_VMSystemProperties_preInit(JNIEnv *env, jclass clazz, java_util_Properties *properties)
+JNIEXPORT void JNICALL Java_gnu_classpath_VMSystemProperties_preInit(JNIEnv *env, jclass clazz, jobject properties)
 {
        java_handle_t *p;
 
@@ -77,11 +74,11 @@ JNIEXPORT void JNICALL Java_gnu_classpath_VMSystemProperties_preInit(JNIEnv *env
  * Method:    postInit
  * Signature: (Ljava/util/Properties;)V
  */
-JNIEXPORT void JNICALL Java_gnu_classpath_VMSystemProperties_postInit(JNIEnv *env, jclass clazz, java_util_Properties *properties)
+JNIEXPORT void JNICALL Java_gnu_classpath_VMSystemProperties_postInit(JNIEnv *env, jclass clazz, jobject properties)
 {
        java_handle_t *p;
 #if defined(ENABLE_JRE_LAYOUT)
-       char *java_home;
+       const char *java_home;
        char *path;
        s4    len;
 #endif