diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2011-08-31 17:02:21 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2011-09-09 12:47:40 -0400 |
| commit | 7cf89847e26af7817827a47cc2f4857d1742f4d0 (patch) | |
| tree | 1a2cb55c5230510e0144fc7b68fa380974439eec /gthread | |
| parent | 46af418e05de82cfd6174575ef3f376aecfe8795 (diff) | |
Stop using HAVE_G_THREAD_IMPL_INIT
Just always call the init function.
Diffstat (limited to 'gthread')
| -rw-r--r-- | gthread/gthread-impl.c | 5 | ||||
| -rw-r--r-- | gthread/gthread-posix.c | 3 | ||||
| -rw-r--r-- | 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 8b531dcaa..19608c2b6 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 d4467c022..2d5dd7e6f 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 df1623389..f913255cf 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 () { |