#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.h"
+#include "vm/method.hpp"
#include "vm/options.h"
#include "vm/os.hpp"
#include "vm/properties.hpp"
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");
/* Get properties from system. */
- char* cwd = _Jv_getcwd();
+ char* cwd = os::getcwd();
char* env_user = os::getenv("USER");
char* env_home = os::getenv("HOME");
uname(utsnamebuf);
- put("java.runtime.version", VERSION);
+ put("java.runtime.version", VERSION_FULL);
put("java.runtime.name", "CACAO");
put("java.specification.version", "1.5");