3 files changed, 11 insertions, 4 deletions
diff --git a/libjava/include/no-threads.h b/libjava/include/no-threads.h
index e500184ca67..69b6d437ba1 100644
--- a/libjava/include/no-threads.h
+++ b/libjava/include/no-threads.h
@@ -102,10 +102,15 @@ _Jv_InitThreads (void)
 {
 }
 
+inline _Jv_Thread_t *
+_Jv_ThreadInitData (java::lang::Thread *)
+{
+  return NULL;
+}
+
 inline void
-_Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread *)
+_Jv_ThreadDestroyData (_Jv_Thread_t *data)
 {
-  *data = NULL;
 }
 
 inline java::lang::Thread *
diff --git a/libjava/include/posix-threads.h b/libjava/include/posix-threads.h
index 5b1f075dc0d..75285ca6f50 100644
--- a/libjava/include/posix-threads.h
+++ b/libjava/include/posix-threads.h
@@ -169,7 +169,8 @@ _Jv_MutexDestroy (_Jv_Mutex_t *mu)
 
 void _Jv_InitThreads (void);
 
-void _Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread *thread);
+_Jv_Thread_t *_Jv_ThreadInitData (java::lang::Thread *thread);
+void _Jv_ThreadDestroyData (_Jv_Thread_t *data);
 
 inline java::lang::Thread *
 _Jv_ThreadCurrent (void)
diff --git a/libjava/include/win32-threads.h b/libjava/include/win32-threads.h
index 4938d5faf57..31b961b253b 100644
--- a/libjava/include/win32-threads.h
+++ b/libjava/include/win32-threads.h
@@ -97,7 +97,8 @@ _Jv_MutexUnlock (_Jv_Mutex_t *mu)
 //
 
 void _Jv_InitThreads (void);
-void _Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread *thread);
+_Jv_Thread_t *_Jv_ThreadInitData (java::lang::Thread *thread);
+void _Jv_ThreadDestroyData (_Jv_Thread_t *data);
 
 inline java::lang::Thread *
 _Jv_ThreadCurrent (void)