diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-17 09:14:12 -0800 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-17 09:14:12 -0800 |
| commit | 520a2b417410bed7db6f08a3a69f3bcccc55910b (patch) | |
| tree | 2365774545ed145c307630b63cb5f075fca71c21 /nuttx/sched/pthread_join.c | |
| parent | 2745c3276f5c2377a9713555c5941b17912b6ce7 (diff) | |
| parent | caa11f0bbb7f30679c5c01a64e1d0f6d8627db9d (diff) | |
| download | px4-firmware-520a2b417410bed7db6f08a3a69f3bcccc55910b.tar.gz px4-firmware-520a2b417410bed7db6f08a3a69f3bcccc55910b.tar.bz2 px4-firmware-520a2b417410bed7db6f08a3a69f3bcccc55910b.zip | |
Merge pull request #198 from PX4/nuttx-merge-5596
Nuttx merge 5596
Diffstat (limited to 'nuttx/sched/pthread_join.c')
| -rw-r--r-- | nuttx/sched/pthread_join.c | 2 |
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); |