Changeset 15d0046 in mainline for uspace/lib/posix/source/sys/wait.c

Timestamp:

2014-09-12T13:22:33Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/posix/source/sys/wait.c (modified) (1 diff)

uspace/lib/posix/source/sys/wait.c

@@ -100 +100 @@
         int retval;
         
-        int rc = task_wait((task_id_t) pid, &texit, &retval);
+        int rc = task_wait_task_id((task_id_t) pid, &texit, &retval);
         
         if (rc < 0) {