summaryrefslogtreecommitdiffstats
path: root/threads.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-01-10 12:54:21 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-01-10 12:54:21 +0100
commitf7c20920046ebcb94eadadf1ebad97b634a12a2d (patch)
tree0cf704f462fa7394842beb3a496627915d863426 /threads.c
parent58c486b36b27d30444b621876846052e239f8c50 (diff)
parent7742b2182fc017ca4c9fcfe3b26f4c8d68a9bd58 (diff)
downloadrsyslog-f7c20920046ebcb94eadadf1ebad97b634a12a2d.tar.gz
rsyslog-f7c20920046ebcb94eadadf1ebad97b634a12a2d.tar.xz
rsyslog-f7c20920046ebcb94eadadf1ebad97b634a12a2d.zip
Merge branch 'v5.6.2-newimudp' into v5-devel-newimudp
Conflicts: plugins/imudp/imudp.c threads.c
Diffstat (limited to 'threads.c')
-rw-r--r--threads.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/threads.c b/threads.c
index 04ccb8d3..d4e14527 100644
--- a/threads.c
+++ b/threads.c
@@ -219,7 +219,13 @@ rsRetVal thrdCreate(rsRetVal (*thrdMain)(thrdInfo_t*), rsRetVal(*afterRun)(thrdI
pThis->pUsrThrdMain = thrdMain;
pThis->pAfterRun = afterRun;
pThis->bNeedsCancel = bNeedsCancel;
- pthread_create(&pThis->thrdID, NULL, thrdStarter, pThis);
+ pthread_create(&pThis->thrdID,
+#ifdef HAVE_PTHREAD_SETSCHEDPARAM
+ &default_thread_attr,
+#else
+ NULL,
+#endif
+ thrdStarter, pThis);
CHKiRet(llAppend(&llThrds, NULL, pThis));
finalize_it: