luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-02 15:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

g_system_thread_join: take GRealThread *

Browse Source 
Make g_system_thread_join take the GRealThread* instead of a
GSystemThread.
This commit is contained in:
Ryan Lortie 2011-10-12 22:14:38 -04:00
parent e064c9bfec
commit 4bb968e335
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gthread-posix.c
View File

@ -1140,10 +1140,10 @@ g_thread_yield (void)
} }
void void
g_system_thread_join (gpointer thread) g_system_thread_join (GRealThread *thread)
{ {
gpointer ignore; gpointer ignore;
posix_check_cmd (pthread_join (*(pthread_t*)thread, &ignore)); posix_check_cmd (pthread_join (*(pthread_t*)&(thread->system_thread), &ignore));
} }
void void

4
glib/gthread-win32.c
View File

@ -539,9 +539,9 @@ g_thread_yield (void)
} }
void void
g_system_thread_join (gpointer thread) g_system_thread_join (GRealThread *thread)
{ {
GThreadData *target = *(GThreadData **)thread; GThreadData *target = *(GThreadData **)&(thread->system_thread);
g_return_if_fail (target->joinable); g_return_if_fail (target->joinable);

2
glib/gthread.c
View File

@ -883,7 +883,7 @@ g_thread_join (GThread *thread)
g_return_val_if_fail (thread, NULL); g_return_val_if_fail (thread, NULL);
g_return_val_if_fail (thread->joinable, NULL); g_return_val_if_fail (thread->joinable, NULL);
g_system_thread_join (&real->system_thread); g_system_thread_join (real);
retval = real->retval; retval = real->retval;

3
glib/gthreadprivate.h
View File

@ -31,7 +31,8 @@ G_BEGIN_DECLS
typedef struct _GRealThread GRealThread; typedef struct _GRealThread GRealThread;
G_GNUC_INTERNAL void g_system_thread_join (gpointer thread); G_GNUC_INTERNAL
void g_system_thread_join (GRealThread *thread);
G_GNUC_INTERNAL G_GNUC_INTERNAL
GRealThread * g_system_thread_new (void); GRealThread * g_system_thread_new (void);