aboutsummaryrefslogtreecommitdiff
path: root/nuttx/sched/pthread_join.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-01-25 00:01:08 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-01-25 00:01:08 +0000
commitb6472b58dcce32d4ab2051f13cef89a6f0296c28 (patch)
treed518e0fc4392bc0990718a7692e3b09a0934b79a /nuttx/sched/pthread_join.c
parenta2ec48846f786e72a976038c9467b25a61ad5a9f (diff)
downloadpx4-firmware-b6472b58dcce32d4ab2051f13cef89a6f0296c28.tar.gz
px4-firmware-b6472b58dcce32d4ab2051f13cef89a6f0296c28.tar.bz2
px4-firmware-b6472b58dcce32d4ab2051f13cef89a6f0296c28.zip
Fix some compilation errors when child status disabled; new waitpid logic not encoding/decoding status properly
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5561 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched/pthread_join.c')
-rw-r--r--nuttx/sched/pthread_join.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx/sched/pthread_join.c b/nuttx/sched/pthread_join.c
index 6a02af352..d3f648dc7 100644
--- a/nuttx/sched/pthread_join.c
+++ b/nuttx/sched/pthread_join.c
@@ -123,7 +123,7 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
* This can fail for one of three reasons: (1) There is no
* thread associated with 'thread,' (2) the thread is a task
* and does not have join information, or (3) the thread
- * was detached and has exitted.
+ * was detached and has exited.
*/
pjoin = pthread_findjoininfo((pid_t)thread);