Merge remote-tracking branch 'origin/released'

* origin/released:
  Updated to latest CVS version of pthreads

Conflicts:
	pthreads/Makefile

1 files changed, 18 insertions, 17 deletions

diff --git a/pthreads/tests/cancel1.c b/pthreads/tests/cancel1.c
index 23d2726a2..f93c497b4 100644
--- a/pthreads/tests/cancel1.c
+++ b/pthreads/tests/cancel1.c
@@ -6,26 +6,27 @@
  *
  *      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
  *      following World Wide Web location:
  *      http://sources.redhat.com/pthreads-win32/contributors.html
- * 
+ *
  *      This library is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU Lesser General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
- * 
+ *
  *      This library is distributed in the hope that it will be useful,
  *      but WITHOUT ANY WARRANTY; without even the implied warranty of
  *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *      Lesser General Public License for more details.
- * 
+ *
  *      You should have received a copy of the GNU Lesser General Public
  *      License along with this library in the file COPYING.LIB;
  *      if not, write to the Free Software Foundation, Inc.,
@@ -34,26 +35,26 @@
  * --------------------------------------------------------------------------
  *
  * Test Synopsis: Test setting cancel state and cancel type.
- * - 
+ * -
  *
  * Test Method (Validation or Falsification):
- * - 
+ * -
  *
  * Requirements Tested:
  * - pthread_setcancelstate function
  * - pthread_setcanceltype function
  *
  * Features Tested:
- * - 
+ * -
  *
  * Cases Tested:
- * - 
+ * -
  *
  * Description:
- * - 
+ * -
  *
  * Environment:
- * - 
+ * -
  *
  * Input:
  * - None.
@@ -139,7 +140,7 @@ main()
     }
 
   /*
-   * Code to control or munipulate child threads should probably go here.
+   * Code to control or manipulate child threads should probably go here.
    */
 
   /*
@@ -151,7 +152,7 @@ main()
    * Standard check that all threads started.
    */
   for (i = 1; i <= NUMTHREADS; i++)
-    { 
+    {
       failed = !threadbag[i].started;
 
       if (failed)
@@ -163,10 +164,10 @@ main()
   assert(!failed);
 
   /*
-   * Check any results here. Set "failed" and only print ouput on failure.
+   * Check any results here. Set "failed" and only print output on failure.
    */
   for (i = 1; i <= NUMTHREADS; i++)
-    { 
+    {
       /* ... */
     }