merged volatile memory barriers

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

diff --git a/src/vm/properties.cpp b/src/vm/properties.cpp
index 333606976253142104383e2585d28f698690f880..a13b8b6dd2479777412dfdbd0694d71d0f660518 100644 (file)
--- a/src/vm/properties.cpp
+++ b/src/vm/properties.cpp
@@ -32,17 +32,14 @@
 #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.h"
+#include "vm/class.hpp"
 #include "vm/global.h"
-#include "vm/method.h"
+#include "vm/method.hpp"
 #include "vm/options.h"
 #include "vm/os.hpp"
 #include "vm/properties.hpp"
@@ -332,14 +329,14 @@ Properties::Properties()
        {
                /* XXX We don't support java.lang.Compiler */
 /*             put("java.compiler", "cacao.jit"); */
-               put("java.vm.info", "JIT mode");
+               put("java.vm.info", "compiled mode");
        }
 
 # if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 
        /* Get properties from system. */
 
-       char* cwd      = _Jv_getcwd();
+       char* cwd      = os::getcwd();
 
        char* env_user = os::getenv("USER");
        char* env_home = os::getenv("HOME");
@@ -650,13 +647,6 @@ void Properties::dump()
 #endif
 
 
-// Legacy C interface.
-extern "C" {
-       void        Properties_put(const char *key, const char *value) { VM::get_current()->get_properties().put(key, value); }
-       const char *Properties_get(const char *key) { return VM::get_current()->get_properties().get(key); }
-}
-
-
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where