2006-06-21 Bryce McKinlay <mckinlay@redhat.com>

        * include/win32-threads.h (_Jv_ThreadDesc_t): New typedef.
        (_Jv_GetPlatformThreadID): New function.
        * include/posix-threads.h (_Jv_ThreadDesc_t): New typedef.
        (_Jv_GetPlatformThreadID): New function.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114854 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 39020de..c1dcf66 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-21  Bryce McKinlay  <mckinlay@redhat.com>
+
+       * include/win32-threads.h (_Jv_ThreadDesc_t): New typedef. 
+       (_Jv_GetPlatformThreadID): New function.
+       * include/posix-threads.h (_Jv_ThreadDesc_t): New typedef.
+       (_Jv_GetPlatformThreadID): New function.
+
 2006-06-20  Bryce McKinlay  <mckinlay@redhat.com>
 
        * gnu/classpath/natSystemProperties.cc (insertSystemProperties):

diff --git a/libjava/include/posix-threads.h b/libjava/include/posix-threads.h
index fe648b7..41adea3 100644 (file)
--- a/libjava/include/posix-threads.h
+++ b/libjava/include/posix-threads.h
@@ -47,7 +47,6 @@ typedef struct _Jv_Thread_t
 
 typedef void _Jv_ThreadStartFunc (java::lang::Thread *);
 
-
 // Condition Variables used to implement wait/notify/sleep/interrupt.
 typedef struct
 {
@@ -82,6 +81,15 @@ _Jv_MutexCheckMonitor (_Jv_Mutex_t *mu)
   return (mu->owner != pthread_self());
 }
 
+// Type identifying a POSIX thread.
+typedef pthread_t _Jv_ThreadDesc_t;
+
+inline _Jv_ThreadDesc_t
+_Jv_GetPlatformThreadID(_Jv_Thread_t *t)
+{
+  return t->thread;
+}
+
 //
 // Condition variables.
 //

diff --git a/libjava/include/win32-threads.h b/libjava/include/win32-threads.h
index 4089b22..b280b8f 100644 (file)
--- a/libjava/include/win32-threads.h
+++ b/libjava/include/win32-threads.h
@@ -72,6 +72,15 @@ _Jv_ThreadSelf (void)
 
 typedef void _Jv_ThreadStartFunc (java::lang::Thread *);
 
+// Type identifying a win32 thread.
+typedef HANDLE _Jv_ThreadDesc_t;
+
+inline _Jv_ThreadDesc_t
+_Jv_GetPlatformThreadID(_Jv_Thread_t *t)
+{
+  return t->handle;
+}
+
 //
 // Condition variables.
 //