g_system_thread_join: rename to _wait()

diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
index 7e86e3890aa33fbbc4e1ec8860e4f50b7aa2f150..f53f722ce9f504c8096de4d0f90dbdf84fbc178f 100644 (file)
--- a/glib/gthread-posix.c
+++ b/glib/gthread-posix.c
@@ -1140,7 +1140,7 @@ g_thread_yield (void)
 }
 
 void
-g_system_thread_join (GRealThread *thread)
+g_system_thread_wait (GRealThread *thread)
 {
   gpointer ignore;
   posix_check_cmd (pthread_join (*(pthread_t*)&(thread->system_thread), &ignore));

diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c
index 02d37ad7e93676b27f69657f21a9796d4cf4c3d5..9988aec6639c2aa9e6e2500915d0db50e66e25dc 100644 (file)
--- a/glib/gthread-win32.c
+++ b/glib/gthread-win32.c
@@ -539,7 +539,7 @@ g_thread_yield (void)
 }
 
 void
-g_system_thread_join (GRealThread *thread)
+g_system_thread_wait (GRealThread *thread)
 {
   GThreadData *target = *(GThreadData **)&(thread->system_thread);
 

diff --git a/glib/gthread.c b/glib/gthread.c
index 30784c38837bf7fbe294c9e582d694f3e706ec8d..f13eb3ae651c47aca0bf17f1ae8c0c1ea7b9a79f 100644 (file)
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -883,7 +883,7 @@ g_thread_join (GThread *thread)
   g_return_val_if_fail (thread, NULL);
   g_return_val_if_fail (thread->joinable, NULL);
 
-  g_system_thread_join (real);
+  g_system_thread_wait (real);
 
   retval = real->retval;
 

diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h
index 1c0756b8d91482f181885056164886409144456f..72aa63cd5327fc416d7697d7fc48571a19bc557b 100644 (file)
--- a/glib/gthreadprivate.h
+++ b/glib/gthreadprivate.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 typedef struct _GRealThread GRealThread;
 
 G_GNUC_INTERNAL
-void            g_system_thread_join            (GRealThread      *thread);
+void            g_system_thread_wait            (GRealThread      *thread);
 
 G_GNUC_INTERNAL
 GRealThread *   g_system_thread_new             (void);