[glib/wip/glib-next: 13/22] Stop using HAVE_G_THREAD_IMPL_INIT
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/glib-next: 13/22] Stop using HAVE_G_THREAD_IMPL_INIT
- Date: Thu, 1 Sep 2011 03:05:35 +0000 (UTC)
commit 2be0afdaa68d59c6ecdc6a7034b7128cc796ab29
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Aug 31 17:02:21 2011 -0400
Stop using HAVE_G_THREAD_IMPL_INIT
Just always call the init function.
gthread/gthread-impl.c | 5 +----
gthread/gthread-posix.c | 3 ---
gthread/gthread-win32.c | 1 -
3 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/gthread/gthread-impl.c b/gthread/gthread-impl.c
index 8b531dc..19608c2 100644
--- a/gthread/gthread-impl.c
+++ b/gthread/gthread-impl.c
@@ -51,10 +51,7 @@ g_thread_init (GThreadFunctions *init)
already_done = TRUE;
-#ifdef HAVE_G_THREAD_IMPL_INIT
- g_thread_impl_init();
-#endif /* HAVE_G_THREAD_IMPL_INIT */
-
+ g_thread_impl_init ();
g_thread_functions_for_glib_use = g_thread_functions_for_glib_use_default;
g_thread_init_glib ();
}
diff --git a/gthread/gthread-posix.c b/gthread/gthread-posix.c
index d4467c0..2d5dd7e 100644
--- a/gthread/gthread-posix.c
+++ b/gthread/gthread-posix.c
@@ -129,8 +129,6 @@ static gulong g_thread_min_stack_size = 0;
#define G_MUTEX_SIZE (sizeof (pthread_mutex_t))
-#if defined(_SC_THREAD_STACK_MIN) || defined (HAVE_PRIORITIES)
-#define HAVE_G_THREAD_IMPL_INIT
static void
g_thread_impl_init(void)
{
@@ -146,7 +144,6 @@ g_thread_impl_init(void)
}
#endif /* HAVE_PRIORITIES */
}
-#endif /* _SC_THREAD_STACK_MIN || HAVE_PRIORITIES */
static GMutex *
g_mutex_new_posix_impl (void)
diff --git a/gthread/gthread-win32.c b/gthread/gthread-win32.c
index df16233..f913255 100644
--- a/gthread/gthread-win32.c
+++ b/gthread/gthread-win32.c
@@ -584,7 +584,6 @@ static GThreadFunctions g_thread_functions_for_glib_use_default =
NULL /* no equal function necessary */
};
-#define HAVE_G_THREAD_IMPL_INIT
static void
g_thread_impl_init ()
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]