summaryrefslogtreecommitdiff
path: root/sync.c
diff options
context:
space:
mode:
authorrpj <rpj>2000-12-29 07:08:44 +0000
committerrpj <rpj>2000-12-29 07:08:44 +0000
commit0c2cb3fb140fb0d12586587001cb1ca238cf8c25 (patch)
tree72caf359f0e3d2aea2c833c8061b65f971f91381 /sync.c
parentbab1896412f2d292ebd8d44bc9d6ddb58a8702b0 (diff)
./ChangeLog:
2000-12-29 Ross Johnson <rpj@special.ise.canberra.edu.au> * Makefile: Back-out "for" loops which don't work. * GNUmakefile: Remove the fake.a target; add the "realclean" target; don't remove built libs under the "clean" target. * config.h: Add a guard against multiple inclusion. * semaphore.h: Add some defines from config.h to make semaphore.h independent of config.h when building apps. * pthread.h (_errno): Back-out previous fix until we know how to fix it properly. * implement.h (lockCount): Add missing element to pthread_mutex_t_. * sync.c (pthread_join): Spelling fix in comment. * private.c (ptw32_threadStart): Reset original termination function (C++). (ptw32_threadStart): Cleanup detached threads early in case the library is statically linked. (ptw32_callUserDestroyRoutines): Remove [SEH] __try block from destructor call so that unhandled exceptions will be passed through to the system; call terminate() from [C++] try block for the same reason. * tsd.c (pthread_getspecific): Add comment. * mutex.c (pthread_mutex_init): Initialise new elements in pthread_mutex_t. (pthread_mutex_unlock): Invert "pthread_equal()" test. 2000-12-28 Ross Johnson <rpj@special.ise.canberra.edu.au> * semaphore.c (mode_t): Use ifndef HAVE_MODE_T to include definition. * config.h.in (HAVE_MODE_T): Added. (_UWIN): Start adding defines for the UWIN package. ./tests/ChangeLog: 2000-12-29 Ross Johnson <rpj@special.ise.canberra.edu.au> * GNUmakefile: Add mutex4 test; ensure libpthreadw32.a is removed for "clean" target. * Makefile: Add mutex4 test. * exception3.c: Remove SEH code; automatically pass the test under SEH (which is an N/A environment). * mutex4.c: New test. * eyal1.c (do_work_unit): Add a dummy "if" to force the optimiser to retain code; reduce thread work loads. * condvar8.c (main): Add an additional "assert" for debugging; increase pthread_cond_signal timeout.
Diffstat (limited to 'sync.c')
-rw-r--r--sync.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sync.c b/sync.c
index 83f421c..4fb168c 100644
--- a/sync.c
+++ b/sync.c
@@ -131,10 +131,10 @@ pthread_join (pthread_t thread, void **value_ptr)
{
/*
* Pthread_join is a cancelation point.
- * If we are cancelled then our target thread must not be
+ * If we are canceled then our target thread must not be
* detached (destroyed). This is guarranteed because
* pthreadCancelableWait will not return if we
- * are cancelled.
+ * are canceled.
*/
result = pthreadCancelableWait(thread->threadH);