merged volatile memory barriers

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

diff --git a/src/vm/properties.cpp b/src/vm/properties.cpp
index f5b66db4d3b487236a19f6461e24ebd148877eba..a13b8b6dd2479777412dfdbd0694d71d0f660518 100644 (file)
--- a/src/vm/properties.cpp
+++ b/src/vm/properties.cpp
@@ -32,14 +32,11 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/utsname.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 
-#include "toolbox/util.h"
-
 #include "vm/class.hpp"
 #include "vm/global.h"
 #include "vm/method.hpp"
@@ -339,7 +336,7 @@ Properties::Properties()
 
        /* Get properties from system. */
 
-       char* cwd      = _Jv_getcwd();
+       char* cwd      = os::getcwd();
 
        char* env_user = os::getenv("USER");
        char* env_home = os::getenv("HOME");