summaryrefslogtreecommitdiffstats
path: root/devel/glib20/files/patch-gthread_gthread-posix.c
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-12-09 02:40:36 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-12-09 02:40:36 +0800
commit32e065f0bb8b36b133b36eb8639160266ac879c9 (patch)
tree81c51f26f3e342201bc2e24cb8c4924c4cb610af /devel/glib20/files/patch-gthread_gthread-posix.c
parenta3b5135851621cb514e7708d11f9dc82f851ea5c (diff)
downloadmarcuscom-ports-32e065f0bb8b36b133b36eb8639160266ac879c9.tar
marcuscom-ports-32e065f0bb8b36b133b36eb8639160266ac879c9.tar.gz
marcuscom-ports-32e065f0bb8b36b133b36eb8639160266ac879c9.tar.bz2
marcuscom-ports-32e065f0bb8b36b133b36eb8639160266ac879c9.tar.lz
marcuscom-ports-32e065f0bb8b36b133b36eb8639160266ac879c9.tar.xz
marcuscom-ports-32e065f0bb8b36b133b36eb8639160266ac879c9.tar.zst
marcuscom-ports-32e065f0bb8b36b133b36eb8639160266ac879c9.zip
Kick off Gnome 2.29 devel cycle with Glib 2.23.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13267 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/glib20/files/patch-gthread_gthread-posix.c')
-rw-r--r--devel/glib20/files/patch-gthread_gthread-posix.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c
new file mode 100644
index 000000000..47c5ab8f1
--- /dev/null
+++ b/devel/glib20/files/patch-gthread_gthread-posix.c
@@ -0,0 +1,21 @@
+--- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004
++++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005
+@@ -125,7 +129,8 @@
+ g_thread_impl_init(void)
+ {
+ #ifdef _SC_THREAD_STACK_MIN
+- g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0);
++ g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN),
++ g_thread_min_stack_size);
+ #endif /* _SC_THREAD_STACK_MIN */
+ #ifdef HAVE_PRIORITIES
+ # ifdef G_THREADS_IMPL_POSIX
+@@ -176,7 +181,7 @@
+ result = pthread_mutex_trylock ((pthread_mutex_t *) mutex);
+
+ #ifdef G_THREADS_IMPL_POSIX
+- if (result == EBUSY)
++ if ((result == EBUSY) || (result == EDEADLK))
+ return FALSE;
+ #else /* G_THREADS_IMPL_DCE */
+ if (result == 0)