* configure.ac: Bump version, append hg revision.

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

diff --git a/src/vm/properties.cpp b/src/vm/properties.cpp
index f5b66db4d3b487236a19f6461e24ebd148877eba..cb49e96acbc5db6af3f41ba89675037584ca3c59 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"
@@ -317,7 +314,7 @@ Properties::Properties()
        put("java.vm.specification.version", "1.0");
        put("java.vm.specification.vendor", "Sun Microsystems Inc.");
        put("java.vm.specification.name", "Java Virtual Machine Specification");
-       put("java.vm.version", VERSION);
+       put("java.vm.version", VERSION_FULL);
        put("java.vm.vendor", "CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO");
        put("java.vm.name", "CACAO");
 
@@ -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");
@@ -349,7 +346,7 @@ Properties::Properties()
 
        uname(utsnamebuf);
 
-       put("java.runtime.version", VERSION);
+       put("java.runtime.version", VERSION_FULL);
        put("java.runtime.name", "CACAO");
 
        put("java.specification.version", "1.5");