summaryrefslogtreecommitdiffstats
path: root/threadlib
diff options
context:
space:
mode:
authorSam Varshavchik2015-02-28 11:59:45 -0500
committerSam Varshavchik2015-02-28 11:59:45 -0500
commitaab9bb42224fbb92c11eabb477282a8f0efe1c17 (patch)
tree9c9f27f6e3755bc7bba874727ae08a0e1a5df48b /threadlib
parent3c35c22f36316dd84533a5d22f04f8b8f90b23a3 (diff)
downloadcourier-libs-aab9bb42224fbb92c11eabb477282a8f0efe1c17.tar.bz2
Remove clean and smudge filters from the git repo that are used to
stamp sysconftool-processed configuration file. Rename all sysconftool-processed configuration files to *.git, and use a build rule to create a stamped sysconftool file. Fix a couple of compilation warnings.
Diffstat (limited to 'threadlib')
-rw-r--r--threadlib/pthread.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/threadlib/pthread.c b/threadlib/pthread.c
index c0d414c..598d03b 100644
--- a/threadlib/pthread.c
+++ b/threadlib/pthread.c
@@ -118,6 +118,7 @@ cthreadinfo_t *i= c->myinfo;
if (PTHREAD_CHK(pthread_cond_signal( &i->newtask_cond )))
perror("pthread_cond_signal");
}
+ return 0;
}
static int initcondmutex(pthread_cond_t *c, pthread_mutex_t *m)
@@ -258,7 +259,7 @@ cthreadinfo_t *cit;
--i;
if (PTHREAD_CHK(pthread_cancel(cit->threads[i].pt)))
perror("pthread_cancel");
-
+
if (PTHREAD_CHK(pthread_join(cit->threads[i].pt, NULL)))
perror("pthread_join");