diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-06-11 08:23:24 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-06-11 08:23:24 +0800 |
| commit | e9a57d9a5f22de029cccebda4c3f15bdb75a5ecc (patch) | |
| tree | 471d1914a559cb993eb1bedc6be13eae4a98a853 | |
| parent | 205dacef7decc24dd893fc166c7defce1c930edb (diff) | |
| download | marcuscom-ports-e9a57d9a5f22de029cccebda4c3f15bdb75a5ecc.tar marcuscom-ports-e9a57d9a5f22de029cccebda4c3f15bdb75a5ecc.tar.gz marcuscom-ports-e9a57d9a5f22de029cccebda4c3f15bdb75a5ecc.tar.bz2 marcuscom-ports-e9a57d9a5f22de029cccebda4c3f15bdb75a5ecc.tar.lz marcuscom-ports-e9a57d9a5f22de029cccebda4c3f15bdb75a5ecc.tar.xz marcuscom-ports-e9a57d9a5f22de029cccebda4c3f15bdb75a5ecc.tar.zst marcuscom-ports-e9a57d9a5f22de029cccebda4c3f15bdb75a5ecc.zip | |
Fix patching on systems that don't support larger default thread stacksizes.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4068 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/glib20/files/extra-patch-gthread_gthread-posix.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/devel/glib20/files/extra-patch-gthread_gthread-posix.c b/devel/glib20/files/extra-patch-gthread_gthread-posix.c index 8796dd629..bde2862f6 100644 --- a/devel/glib20/files/extra-patch-gthread_gthread-posix.c +++ b/devel/glib20/files/extra-patch-gthread_gthread-posix.c @@ -1,6 +1,6 @@ ---- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004 -+++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005 -@@ -115,7 +115,11 @@ +--- gthread/gthread-posix.c.orig Thu Jun 9 11:25:01 2005 ++++ gthread/gthread-posix.c Fri Jun 10 20:23:17 2005 +@@ -115,7 +115,11 @@ static gint priority_normal_value; # define PRIORITY_NORMAL_VALUE priority_normal_value #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */ @@ -12,21 +12,21 @@ #define G_MUTEX_SIZE (sizeof (pthread_mutex_t)) -@@ -307,8 +312,16 @@ - if (stack_size) - { +@@ -309,8 +313,16 @@ g_thread_create_posix_impl (GThreadFunc stack_size = MAX (g_thread_min_stack_size, stack_size); -- posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size)); + /* No error check here, because some systems can't do it and + * we simply don't want threads to fail because of that. */ +- pthread_attr_setstacksize (&attr, stack_size); } + else + { + if (sizeof(void *) == 8) -+ g_thread_default_stack_size = G_THREAD_STACK_SIZE64; ++ g_thread_default_stack_size = G_THREAD_STACK_SIZE64; + else -+ g_thread_default_stack_size = G_THREAD_STACK_SIZE32; ++ g_thread_default_stack_size = G_THREAD_STACK_SIZE32; + stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size); + } -+ posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size)); ++ pthread_attr_setstacksize (&attr, stack_size); #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */ #ifdef PTHREAD_SCOPE_SYSTEM |