* src/threads/threads-common.c (threads_start_javathread): Changed

signature.

* src/threads/lock-common.h (threads/threads-common.h): Added.
[ENABLE_THREADS]: Only define functions when threads are enabled.

* src/threads/threads-common.h (native/include/java_lang_Thread.h):
Removed.
[ENABLE_THREADS]: Only define functions when threads are enabled.
(threads_start_javathread): Changed signature.

diff --git a/src/threads/lock-common.h b/src/threads/lock-common.h
index 433c16db8f631e2434c9d1f2d95adf8538fa50de..b4177c02fcaec9314b4d523c154937a71b1cfe7b 100644 (file)
--- a/src/threads/lock-common.h
+++ b/src/threads/lock-common.h
@@ -41,6 +41,12 @@
 # include "threads/none/lock.h"
 #endif
 
+#include "threads/threads-common.h"
+
+
+/* only define the following stuff with thread enabled ************************/
+
+#if defined(ENABLE_THREADS)
 
 /* functions ******************************************************************/
 
@@ -66,6 +72,8 @@ void lock_wait_for_object(java_objectheader *o, s8 millis, s4 nanos);
 void lock_notify_object(java_objectheader *o);
 void lock_notify_all_object(java_objectheader *o);
 
+#endif /* ENABLE_THREADS */
+
 #endif /* _LOCK_COMMON_H */
 
 

diff --git a/src/threads/threads-common.c b/src/threads/threads-common.c
index a32864efd0c59fc3d5cab13a89d1e7af64ef4509..5d3956c4043fdf8dc92f7f8b3ec0dca58df08d7e 100644 (file)
--- a/src/threads/threads-common.c
+++ b/src/threads/threads-common.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: threads-common.c 7813 2007-04-25 19:20:13Z twisti $
+   $Id: threads-common.c 7825 2007-04-25 20:31:57Z twisti $
 
 */
 
@@ -163,9 +163,12 @@ threadobject *threads_thread_create_internal(utf *name)
 
 *******************************************************************************/
 
-void threads_start_javathread(java_lang_Thread *object)
+void threads_start_javathread(void *vobject)
 {
-       threadobject *thread;
+       threadobject     *thread;
+       java_lang_Thread *object;
+
+       object = (java_lang_Thread *) vobject;
 
        /* create internal thread data-structure */
 

diff --git a/src/threads/threads-common.h b/src/threads/threads-common.h
index 72c8866afe8fd3e7cca906ef522d698c3f912799..c0d589b99248315f5d81f33c11837040d3cf1bbb 100644 (file)
--- a/src/threads/threads-common.h
+++ b/src/threads/threads-common.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: threads-common.h 7811 2007-04-25 18:33:30Z twisti $
+   $Id: threads-common.h 7825 2007-04-25 20:31:57Z twisti $
 
 */
 
@@ -37,8 +37,6 @@
 
 #include "native/jni.h"
 
-#include "native/include/java_lang_Thread.h"
-
 #if defined(ENABLE_THREADS)
 # include "threads/native/threads.h"
 #else
@@ -48,6 +46,10 @@
 #include "vmcore/utf8.h"
 
 
+/* only define the following stuff with thread enabled ************************/
+
+#if defined(ENABLE_THREADS)
+
 /* thread states **************************************************************/
 
 #define THREAD_STATE_NEW              0
@@ -69,7 +71,7 @@
 
 threadobject *threads_create_thread(void);
 threadobject *threads_thread_create_internal(utf *name);
-void          threads_start_javathread(java_lang_Thread *object);
+void          threads_start_javathread(void *vobject);
 ptrint        threads_get_current_tid(void);
 utf          *threads_thread_get_state(threadobject *thread);
 bool          threads_thread_is_alive(threadobject *thread);
@@ -77,6 +79,8 @@ void          threads_dump(void);
 void          threads_thread_print_stacktrace(threadobject *thread);
 void          threads_print_stacktrace(void);
 
+#endif /* ENABLE_THREADS */
+
 #endif /* _THREADS_COMMON_H */