* Moved all files from vmcore/ to vm/.

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

diff --git a/src/vm/assertion.c b/src/vm/assertion.c
index afa01d4b169e30d30f9d0f914beff20d0ebf13e8..efe40b2776a09d785ebfec95cbcf46ac8ee1e6be 100644 (file)
--- a/src/vm/assertion.c
+++ b/src/vm/assertion.c
@@ -34,9 +34,8 @@
 
 #include "vm/assertion.h"
 #include "vm/global.h"
-#include "vm/vm.h"
-
-#include "vmcore/system.h"
+#include "vm/os.hpp"
+#include "vm/vm.hpp"
 
 
 /* -ea/-da options ************************************************************/
@@ -68,13 +67,13 @@ void assertion_ea_da(const char *name, bool enabled)
        }
 
        package = false;
-       len     = system_strlen(name);
+       len     = os_strlen(name);
 
        if (name[len - 1] == '/') {
                return;
        }
 
-       buf = system_strdup(name);
+       buf = os_strdup(name);
 
        if (buf == NULL) {
                vm_abort("assertion_ea_da: strdup failed: %s", strerror(errno));
@@ -83,7 +82,7 @@ void assertion_ea_da(const char *name, bool enabled)
        if ((len > 2) && (strcmp(name + (len - 3), "...") == 0)) {
                package = true;
                assertion_package_count += 1;
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
                buf[len - 2] = '\0';
                buf[len - 3] = '/';
 #else
@@ -94,10 +93,10 @@ void assertion_ea_da(const char *name, bool enabled)
                assertion_class_count += 1;
        }
 
-       len = system_strlen(buf);
+       len = os_strlen(buf);
 
        for (i = 0; i < len; i++) {
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
                if (buf[i] == '.') {
                        buf[i] = '/';
                }