* m4/classpath.m4: Renamed --with-classpath* options to

[cacao.git] / src / native / vm / nativevm.c

diff --git a/src/native/vm/nativevm.c b/src/native/vm/nativevm.c
index e6e2369d0668b2dcc918a6a50ded41df068586fe..a42ed66f615be4b88ee723a1125049540902846f 100644 (file)
--- a/src/native/vm/nativevm.c
+++ b/src/native/vm/nativevm.c
@@ -36,7 +36,7 @@
 #include "vmcore/options.h"
 #include "vmcore/system.h"
 
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
 # include "mm/memory.h"
 
 # include "native/native.h"
@@ -61,7 +61,7 @@ void nativevm_preinit(void)
        /* Register native methods of all classes implemented. */
 
 #if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 
        TRACESUBSYSTEMINITIALIZATION("nativevm_preinit");
 
@@ -93,7 +93,7 @@ void nativevm_preinit(void)
        _Jv_sun_reflect_ConstantPool_init();
 #endif
 
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
 
        char        *boot_library_path;
        int          len;
@@ -173,13 +173,13 @@ void nativevm_init(void)
 {
 #if defined(ENABLE_JAVASE)
 
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 
        TRACESUBSYSTEMINITIALIZATION("nativevm_init");
 
        /* nothing to do */
 
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
 
        methodinfo *m;