* src/threads/native/threads.c: Fixed some compiler warnings.

* src/threads/threads-common.c: Likewise.

diff --git a/src/threads/native/threads.c b/src/threads/native/threads.c
index f64af9fec18536acbbabc9a864ca641a5ce523f7..131c88892ca83bfd66430d713f4125776d11fbf2 100644 (file)
--- a/src/threads/native/threads.c
+++ b/src/threads/native/threads.c
@@ -969,7 +969,7 @@ bool threads_init(void)
 
        /* set the object in the internal data structure */
 
-       threads_thread_set_object(mainthread, t);
+       threads_thread_set_object(mainthread, (java_handle_t *) t);
 
 #if defined(ENABLE_INTRP)
        /* create interpreter stack */
@@ -1430,7 +1430,7 @@ bool threads_attach_current_thread(JavaVMAttachArgs *vm_aargs, bool isdaemon)
        if (t == NULL)
                return false;
 
-       threads_thread_set_object(thread, t);
+       threads_thread_set_object(thread, (java_handle_t *) t);
 
        /* thread is completely initialized */
 
@@ -1487,7 +1487,7 @@ bool threads_attach_current_thread(JavaVMAttachArgs *vm_aargs, bool isdaemon)
 
                mainthread = threads_list_first();
                mainthreado = (java_lang_Thread *) threads_thread_get_object(mainthread);
-               group = LLNI_field_direct(mainthreado, group);
+               LLNI_field_get_ref(mainthreado, group, group);
 #endif
        }
 

diff --git a/src/threads/threads-common.c b/src/threads/threads-common.c
index e53c0f5667e0decad97b01dfa059c1090c04b357..bd02f9401af39c1a49cc82105cec133bb80f08cb 100644 (file)
--- a/src/threads/threads-common.c
+++ b/src/threads/threads-common.c
@@ -43,6 +43,7 @@
 #include "native/include/java_lang_Thread.h"
 
 #if defined(WITH_CLASSPATH_GNU)
+# include "native/include/java_lang_Throwable.h"
 # include "native/include/java_lang_VMThread.h"
 #endif
 
@@ -454,7 +455,7 @@ bool threads_thread_start_internal(utf *name, functionptr f)
        LLNI_field_set_val(object, vm_thread, (java_lang_Object *) t);
 #endif
 
-       threads_thread_set_object(t, object);
+       threads_thread_set_object(t, (java_handle_t *) object);
 
        /* set java.lang.Thread fields */