* src/native/jni.h: Removed.

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

diff --git a/src/vm/properties.c b/src/vm/properties.c
index b5d9760a29666a229e84d48d064b8388760ee1aa..10f2a793a48b1dcaeaf4dd6f408bbd97d5fa3003 100644 (file)
--- a/src/vm/properties.c
+++ b/src/vm/properties.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,30 +33,24 @@
 #include <unistd.h>
 #include <sys/utsname.h>
 
-#include "vm/types.h"
-
 #include "mm/memory.h"
 
-#include "native/jni.h"
 #include "native/llni.h"
 
-#include "vm/global.h"                      /* required by java_lang_String.h */
-#include "native/include/java_lang_String.h"
-
 #include "toolbox/list.h"
 #include "toolbox/util.h"
 
+#include "vm/class.h"
+#include "vm/global.h"
+#include "vm/method.h"
+#include "vm/options.h"
+#include "vm/os.hpp"
 #include "vm/properties.h"
 #include "vm/string.hpp"
 #include "vm/vm.hpp"
 
 #include "vm/jit/asmpart.h"
 
-#include "vmcore/class.h"
-#include "vmcore/method.h"
-#include "vmcore/options.h"
-#include "vmcore/system.h"
-
 
 /* internal property structure ************************************************/
 
@@ -139,8 +134,8 @@ void properties_set(void)
 
           Now let's strip two levels. */
 
-       p = system_dirname(p);
-       p = system_dirname(p);
+       p = os_dirname(p);
+       p = os_dirname(p);
 
 # if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 
@@ -177,7 +172,7 @@ void properties_set(void)
 
        /* Check if that libjvm.so exists. */
 
-       if (system_access(java_home, F_OK) == 0) {
+       if (os_access(java_home, F_OK) == 0) {
                /* Yes, we add /jre to java.home. */
 
                strcpy(java_home, p);