diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 11:03:57 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 11:03:57 +0100 |
| commit | 8fa17b13062c1e2acca542cc7a2ccb09aca874e8 (patch) | |
| tree | 158a6239b0fdf2abf63fb7365b4cd4886c15f5b1 /pthreads/tests/condvar9.c | |
| parent | 4a165ef2f762a4ce9155f2a3626692326bda616d (diff) | |
| parent | b41f74438672dd682bc01ae818cb3da654f22c1e (diff) | |
| download | vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.gz vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.bz2 vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Updated to latest CVS version of pthreads
Conflicts:
pthreads/Makefile
Diffstat (limited to 'pthreads/tests/condvar9.c')
| -rw-r--r-- | pthreads/tests/condvar9.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pthreads/tests/condvar9.c b/pthreads/tests/condvar9.c index 62d044bf8..910d37b27 100644 --- a/pthreads/tests/condvar9.c +++ b/pthreads/tests/condvar9.c @@ -6,10 +6,11 @@ * * Pthreads-win32 - POSIX Threads Library for Win32 * Copyright(C) 1998 John E. Bossom - * Copyright(C) 1999,2005 Pthreads-win32 contributors - * - * Contact Email: rpj@callisto.canberra.edu.au - * + * Copyright(C) 1999,2012 Pthreads-win32 contributors + * + * Homepage1: http://sourceware.org/pthreads-win32/ + * Homepage2: http://sourceforge.net/projects/pthreads4w/ + * * The current list of contributors is contained * in the file CONTRIBUTORS included with the source * code distribution. The list can also be seen at the @@ -34,7 +35,7 @@ * -------------------------------------------------------------------------- * * Test Synopsis: - * - Test multiple pthread_cond_broadcasts with thread cancelation. + * - Test multiple pthread_cond_broadcasts with thread cancellation. * * Test Method (Validation or Falsification): * - Validation @@ -128,7 +129,7 @@ mythread(void * arg) assert(pthread_mutex_lock(&cvthing.lock) == 0); /* - * pthread_cond_timedwait is a cancelation point and we're + * pthread_cond_timedwait is a cancellation point and we're * going to cancel some threads deliberately. */ #ifdef _MSC_VER @@ -199,7 +200,7 @@ main() } /* - * Code to control or munipulate child threads should probably go here. + * Code to control or manipulate child threads should probably go here. */ cvthing.shared = 0; |