diff options
Diffstat (limited to 'libjava/java')
-rw-r--r-- | libjava/java/lang/VMClassLoader.java | 4 | ||||
-rw-r--r-- | libjava/java/lang/natVMClassLoader.cc | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/java/lang/VMClassLoader.java b/libjava/java/lang/VMClassLoader.java index 1afda45..e21bb64 100644 --- a/libjava/java/lang/VMClassLoader.java +++ b/libjava/java/lang/VMClassLoader.java @@ -40,15 +40,19 @@ package java.lang; import gnu.java.util.EmptyEnumeration; import java.lang.reflect.Constructor; +import java.io.File; import java.io.IOException; import java.net.URL; +import java.net.URLClassLoader; import java.security.AllPermission; import java.security.Permission; import java.security.Permissions; import java.security.ProtectionDomain; +import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; +import java.util.StringTokenizer; /** * java.lang.VMClassLoader is a package-private helper for VMs to implement diff --git a/libjava/java/lang/natVMClassLoader.cc b/libjava/java/lang/natVMClassLoader.cc index e34be99..cd98e7e 100644 --- a/libjava/java/lang/natVMClassLoader.cc +++ b/libjava/java/lang/natVMClassLoader.cc @@ -24,6 +24,7 @@ details. */ #include <java/lang/VMClassLoader.h> #include <java/lang/VMCompiler.h> #include <gnu/gcj/runtime/VMClassLoader.h> +#include <gnu/gcj/runtime/SystemClassLoader.h> #include <java/lang/ClassLoader.h> #include <java/lang/Class.h> #include <java/lang/Throwable.h> @@ -114,7 +115,7 @@ java::lang::ClassLoader * java::lang::VMClassLoader::getSystemClassLoaderInternal() { _Jv_InitClass (&gnu::gcj::runtime::VMClassLoader::class$); - return gnu::gcj::runtime::VMClassLoader::instance; + return gnu::gcj::runtime::VMClassLoader::system_instance; } jclass |