[glib] g_system_thread_join: rename to _wait()
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] g_system_thread_join: rename to _wait()
- Date: Thu, 13 Oct 2011 02:16:09 +0000 (UTC)
commit dc3727cc5f4f4c9939e010722ea28e152cf9b324
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Oct 12 22:15:46 2011 -0400
g_system_thread_join: rename to _wait()
glib/gthread-posix.c | 2 +-
glib/gthread-win32.c | 2 +-
glib/gthread.c | 2 +-
glib/gthreadprivate.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
index 7e86e38..f53f722 100644
--- 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 02d37ad..9988aec 100644
--- 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 30784c3..f13eb3a 100644
--- 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 1c0756b..72aa63c 100644
--- 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]