[io-layer] Make _WapiHandle_thread struct public

diff --git a/mono/io-layer/thread-private.h b/mono/io-layer/thread-private.h
index a4095002dddf441f117ea52f039f0e9791398cf2..c50e53271a9318dcc2e618cc1fff4ba5fe287cdd 100644 (file)
--- a/mono/io-layer/thread-private.h
+++ b/mono/io-layer/thread-private.h
@@ -19,15 +19,6 @@
 /* There doesn't seem to be a defined symbol for this */
 #define _WAPI_THREAD_CURRENT (gpointer)0xFFFFFFFE
 
-struct _WapiHandle_thread
-{
-       pthread_t id;
-       GPtrArray *owned_mutexes;
-       gint32 priority;
-};
-
-typedef struct _WapiHandle_thread WapiHandle_thread;
-
 void
 _wapi_thread_init (void);
 

diff --git a/mono/io-layer/threads.h b/mono/io-layer/threads.h
index 412f0f1ebe89acbe106fc605c82312e054628d61..5ba122b86fed24782078ba3d9b1e25c5e9fa1ee5 100644 (file)
--- a/mono/io-layer/threads.h
+++ b/mono/io-layer/threads.h
@@ -12,6 +12,8 @@
 
 #include <glib.h>
 
+#include <pthread.h>
+
 #include <mono/io-layer/io.h>
 #include <mono/io-layer/status.h>
 #include <mono/io-layer/processes.h>
@@ -24,6 +26,12 @@ G_BEGIN_DECLS
 #define THREAD_ALL_ACCESS              (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3ff)
 
 typedef guint32 (*WapiThreadStart)(gpointer);
+
+typedef struct {
+       pthread_t id;
+       GPtrArray *owned_mutexes;
+       gint32 priority;
+} MonoW32HandleThread;
  
 typedef enum {
        THREAD_PRIORITY_LOWEST = -2,

diff --git a/mono/io-layer/wthreads.c b/mono/io-layer/wthreads.c
index 16c5f0e50d216792013e68cce625bed5cd8fc06c..503fb033d90fc6c5386ee2d38499ccd3a95b7377 100644 (file)
--- a/mono/io-layer/wthreads.c
+++ b/mono/io-layer/wthreads.c
@@ -64,7 +64,7 @@ _wapi_thread_init (void)
 
 static void thread_details (gpointer data)
 {
-       WapiHandle_thread *thread = (WapiHandle_thread*) data;
+       MonoW32HandleThread *thread = (MonoW32HandleThread*) data;
        g_print ("id: %p, owned_mutexes: %d, priority: %d",
                thread->id, thread->owned_mutexes->len, thread->priority);
 }
@@ -76,7 +76,7 @@ static const gchar* thread_typename (void)
 
 static gsize thread_typesize (void)
 {
-       return sizeof (WapiHandle_thread);
+       return sizeof (MonoW32HandleThread);
 }
 
 void
@@ -95,10 +95,10 @@ get_current_thread_handle (void)
        return info->handle;
 }
 
-static WapiHandle_thread*
+static MonoW32HandleThread*
 lookup_thread (HANDLE handle)
 {
-       WapiHandle_thread *thread;
+       MonoW32HandleThread *thread;
        gboolean ok;
 
        ok = mono_w32handle_lookup (handle, MONO_W32HANDLE_THREAD,
@@ -107,7 +107,7 @@ lookup_thread (HANDLE handle)
        return thread;
 }
 
-static WapiHandle_thread*
+static MonoW32HandleThread*
 get_current_thread (void)
 {
        gpointer handle;
@@ -119,7 +119,7 @@ get_current_thread (void)
 void
 wapi_thread_handle_set_exited (gpointer handle, guint32 exitstatus)
 {
-       WapiHandle_thread *thread_handle;
+       MonoW32HandleThread *thread_handle;
        int i, thr_ret;
        pid_t pid = _wapi_getpid ();
        pthread_t tid = pthread_self ();
@@ -169,7 +169,7 @@ wapi_thread_handle_set_exited (gpointer handle, guint32 exitstatus)
 gpointer
 wapi_create_thread_handle (void)
 {
-       WapiHandle_thread thread_handle = {0}, *thread;
+       MonoW32HandleThread thread_handle = {0}, *thread;
        gpointer handle;
 
        thread_handle.owned_mutexes = g_ptr_array_new ();
@@ -218,7 +218,7 @@ _wapi_thread_cur_apc_pending (void)
 void
 _wapi_thread_own_mutex (gpointer mutex)
 {
-       WapiHandle_thread *thread;
+       MonoW32HandleThread *thread;
        
        thread = get_current_thread ();
 
@@ -230,7 +230,7 @@ _wapi_thread_own_mutex (gpointer mutex)
 void
 _wapi_thread_disown_mutex (gpointer mutex)
 {
-       WapiHandle_thread *thread;
+       MonoW32HandleThread *thread;
 
        thread = get_current_thread ();
 
@@ -249,7 +249,7 @@ _wapi_thread_disown_mutex (gpointer mutex)
 void
 wapi_init_thread_info_priority (gpointer handle, gint32 priority)
 {
-       struct _WapiHandle_thread *thread_handle = NULL;
+       MonoW32HandleThread *thread_handle = NULL;
        gboolean ok = mono_w32handle_lookup (handle, MONO_W32HANDLE_THREAD,
                                  (gpointer *)&thread_handle);
                                  
@@ -382,7 +382,7 @@ wapi_thread_priority_to_posix_priority (WapiThreadPriority priority, int policy)
 gint32 
 GetThreadPriority (gpointer handle)
 {
-       struct _WapiHandle_thread *thread_handle = NULL;
+       MonoW32HandleThread *thread_handle = NULL;
        int policy;
        struct sched_param param;
        gboolean ok = mono_w32handle_lookup (handle, MONO_W32HANDLE_THREAD,
@@ -415,7 +415,7 @@ GetThreadPriority (gpointer handle)
 gboolean 
 SetThreadPriority (gpointer handle, gint32 priority)
 {
-       struct _WapiHandle_thread *thread_handle = NULL;
+       MonoW32HandleThread *thread_handle = NULL;
        int policy,
            posix_priority,
            rv;
@@ -460,7 +460,7 @@ SetThreadPriority (gpointer handle, gint32 priority)
 char*
 wapi_current_thread_desc (void)
 {
-       WapiHandle_thread *thread;
+       MonoW32HandleThread *thread;
        gpointer thread_handle;
        int i;
        GString* text;