* Merged with 3aaaa9f60c5d.

diff --git a/src/native/llni.h b/src/native/llni.h
index af6a2b16f42c9e54908a1aa0cb4b4808826ce024..a0c4cad861ab2cdb9ceac0c270a390b67cced8ea 100644 (file)
--- a/src/native/llni.h
+++ b/src/native/llni.h
@@ -102,7 +102,7 @@
 /* XXX document me */
 
 #define LLNI_objectarray_element_set(arr, index, reference) \
-       LLNI_array_direct(arr, index) = LLNI_DIRECT(reference)
+       LLNI_array_direct(arr, index) = (java_object_t *) LLNI_DIRECT(reference)
 
 #define LLNI_objectarray_element_get(arr, index, variable) \
        (variable) = LLNI_WRAP(LLNI_array_direct(arr, index))
@@ -121,8 +121,8 @@
 # define LLNI_UNWRAP(hdl) ((hdl) == NULL ? NULL : (hdl)->heap_object)
 # define LLNI_DIRECT(obj) ((obj)->heap_object)
 #else
-# define LLNI_WRAP(obj)   ((java_handle_t *) obj)
-# define LLNI_UNWRAP(hdl) ((java_object_t *) hdl)
+# define LLNI_WRAP(obj)   (obj)
+# define LLNI_UNWRAP(hdl) (hdl)
 # define LLNI_DIRECT(obj) (obj)
 #endif
 

diff --git a/src/native/vm/reflect.c b/src/native/vm/reflect.c
index 72b268ab6f590094a162bd38cbaaf8890fb251ff..9f9daa5890fe02c283e4a7388e7616b361dd23fa 100644 (file)
--- a/src/native/vm/reflect.c
+++ b/src/native/vm/reflect.c
@@ -166,7 +166,7 @@ java_lang_reflect_Field *reflect_field_new(fieldinfo *f)
        /* The name needs to be interned */
        /* XXX implement me better! */
 
-       LLNI_field_set_ref(rf, name          , javastring_intern((java_lang_String *) javastring_new(f->name)));
+       LLNI_field_set_ref(rf, name          , javastring_intern(javastring_new(f->name)));
        LLNI_field_set_val(rf, slot          , slot);
        LLNI_field_set_ref(rf, annotations   , field_get_annotations(f));
 
@@ -177,7 +177,7 @@ java_lang_reflect_Field *reflect_field_new(fieldinfo *f)
        /* The name needs to be interned */
        /* XXX implement me better! */
 
-       LLNI_field_set_ref(rf, name          , javastring_intern((java_lang_String *) javastring_new(f->name)));
+       LLNI_field_set_ref(rf, name          , javastring_intern(javastring_new(f->name)));
        LLNI_field_set_cls(rf, type          , (java_lang_Class *) field_get_type(f));
        LLNI_field_set_val(rf, modifiers     , f->flags);
        LLNI_field_set_val(rf, slot          , slot);
@@ -232,7 +232,7 @@ java_lang_reflect_Method *reflect_method_new(methodinfo *m)
        /* The name needs to be interned */
        /* XXX implement me better! */
 
-       LLNI_field_set_ref(rm, name                , javastring_intern((java_lang_String *) javastring_new(m->name)));
+       LLNI_field_set_ref(rm, name                , javastring_intern(javastring_new(m->name)));
        LLNI_field_set_val(rm, slot                , slot);
        LLNI_field_set_ref(rm, annotations         , method_get_annotations(m));
        LLNI_field_set_ref(rm, parameterAnnotations, method_get_parameterannotations(m));
@@ -245,7 +245,7 @@ java_lang_reflect_Method *reflect_method_new(methodinfo *m)
        /* The name needs to be interned */
        /* XXX implement me better! */
 
-       LLNI_field_set_ref(rm, name                , javastring_intern((java_lang_String *) javastring_new(m->name)));
+       LLNI_field_set_ref(rm, name                , javastring_intern(javastring_new(m->name)));
        LLNI_field_set_ref(rm, parameterTypes      , method_get_parametertypearray(m));
        LLNI_field_set_cls(rm, returnType          , (java_lang_Class *) method_returntype_get(m));
        LLNI_field_set_ref(rm, exceptionTypes      , method_get_exceptionarray(m));

diff --git a/src/vm/builtin.c b/src/vm/builtin.c
index 4b3c161fdc667187aa6184c596a0b0a9c8b804ea..23588740155e7dfbcec5a2bee2948b2fdd371632 100644 (file)
--- a/src/vm/builtin.c
+++ b/src/vm/builtin.c
@@ -1192,7 +1192,8 @@ java_handle_objectarray_t *builtin_multianewarray(int n, classinfo *arrayclass,
 
        /* now call the real function */
 
-       return builtin_multianewarray_intern(n, arrayclass, dims);
+       return (java_handle_objectarray_t *)
+               builtin_multianewarray_intern(n, arrayclass, dims);
 }