aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/cancel4.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-13 11:03:57 +0100
committermarha <marha@users.sourceforge.net>2013-02-13 11:03:57 +0100
commit8fa17b13062c1e2acca542cc7a2ccb09aca874e8 (patch)
tree158a6239b0fdf2abf63fb7365b4cd4886c15f5b1 /pthreads/tests/cancel4.c
parent4a165ef2f762a4ce9155f2a3626692326bda616d (diff)
parentb41f74438672dd682bc01ae818cb3da654f22c1e (diff)
downloadvcxsrv-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/cancel4.c')
-rw-r--r--pthreads/tests/cancel4.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/pthreads/tests/cancel4.c b/pthreads/tests/cancel4.c
index 893f33b12..4267f1728 100644
--- a/pthreads/tests/cancel4.c
+++ b/pthreads/tests/cancel4.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
@@ -33,8 +34,8 @@
*
* --------------------------------------------------------------------------
*
- * Test Synopsis: Test cancelation does not occur in deferred
- * cancelation threads with no cancelation points.
+ * Test Synopsis: Test cancellation does not occur in deferred
+ * cancellation threads with no cancellation points.
*
* Test Method (Validation or Falsification):
* -
@@ -113,7 +114,7 @@ mythread(void * arg)
/*
* We wait up to 2 seconds, waking every 0.1 seconds,
- * for a cancelation to be applied to us.
+ * for a cancellation to be applied to us.
*/
for (bag->count = 0; bag->count < 20; bag->count++)
Sleep(100);
@@ -138,7 +139,7 @@ main()
}
/*
- * Code to control or munipulate child threads should probably go here.
+ * Code to control or manipulate child threads should probably go here.
*/
Sleep(500);
@@ -176,9 +177,9 @@ main()
void* result = (void*)0;
/*
- * The thread does not contain any cancelation points, so
+ * The thread does not contain any cancellation points, so
* a return value of PTHREAD_CANCELED indicates that async
- * cancelation occurred.
+ * cancellation occurred.
*/
assert(pthread_join(t[i], &result) == 0);