aboutsummaryrefslogtreecommitdiff
path: root/pthreads/pthread_join.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/pthread_join.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/pthread_join.c')
-rw-r--r--pthreads/pthread_join.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/pthreads/pthread_join.c b/pthreads/pthread_join.c
index c2b7c1e75..963725516 100644
--- a/pthreads/pthread_join.c
+++ b/pthreads/pthread_join.c
@@ -9,10 +9,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
@@ -35,6 +36,10 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "pthread.h"
#include "implement.h"
@@ -123,9 +128,9 @@ pthread_join (pthread_t thread, void **value_ptr)
else
{
/*
- * Pthread_join is a cancelation point.
+ * Pthread_join is a cancellation point.
* If we are canceled then our target thread must not be
- * detached (destroyed). This is guarranteed because
+ * detached (destroyed). This is guaranteed because
* pthreadCancelableWait will not return if we
* are canceled.
*/