projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged revisions 8321-8342 via svnmerge from
[cacao.git]
/
src
/
native
/
vm
/
gnu
/
java_lang_VMClassLoader.c
diff --git
a/src/native/vm/gnu/java_lang_VMClassLoader.c
b/src/native/vm/gnu/java_lang_VMClassLoader.c
index 6f4c6a217557cb48357d5040da70eb822de33ea1..3c9b5ac16e978694869349cd35fb88d0aa600546 100644
(file)
--- a/
src/native/vm/gnu/java_lang_VMClassLoader.c
+++ b/
src/native/vm/gnu/java_lang_VMClassLoader.c
@@
-22,7
+22,7
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: java_lang_VMClassLoader.c 83
35 2007-08-17 11:04:35
Z michi $
+ $Id: java_lang_VMClassLoader.c 83
43 2007-08-17 21:39:32
Z michi $
*/
*/
@@
-37,6
+37,7
@@
#include "mm/memory.h"
#include "native/jni.h"
#include "mm/memory.h"
#include "native/jni.h"
+#include "native/llni.h"
#include "native/native.h"
#include "native/include/java_lang_Class.h"
#include "native/include/java_lang_String.h"
#include "native/native.h"
#include "native/include/java_lang_Class.h"
#include "native/include/java_lang_String.h"
@@
-129,7
+130,7
@@
JNIEXPORT java_lang_Class* JNICALL Java_java_lang_VMClassLoader_getPrimitiveClas
return NULL;
}
return NULL;
}
- return
(java_lang_Class *) c
;
+ return
LLNI_classinfo_wrap(c)
;
}
}
@@
-142,7
+143,7
@@
JNIEXPORT void JNICALL Java_java_lang_VMClassLoader_resolveClass(JNIEnv *env, jc
{
classinfo *ci;
{
classinfo *ci;
- ci =
(classinfo *) c
;
+ ci =
LLNI_classinfo_unwrap(c)
;
if (!ci) {
exceptions_throw_nullpointerexception();
if (!ci) {
exceptions_throw_nullpointerexception();
@@
-190,7
+191,7
@@
JNIEXPORT java_lang_Class* JNICALL Java_java_lang_VMClassLoader_loadClass(JNIEnv
if (!link_class(c))
return NULL;
if (!link_class(c))
return NULL;
- return
(java_lang_Class *) c
;
+ return
LLNI_classinfo_wrap(c)
;
}
}
@@
-378,7
+379,7
@@
JNIEXPORT java_lang_Class* JNICALL Java_java_lang_VMClassLoader_findLoadedClass(
if (c == NULL)
c = classcache_lookup(cl, u);
if (c == NULL)
c = classcache_lookup(cl, u);
- return
(java_lang_Class *) c
;
+ return
LLNI_classinfo_wrap(c)
;
}
}