Changeset 87b4baa in mainline for uspace/lib/c/generic/task.c

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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/c/generic/task.c (modified) (2 diffs)

uspace/lib/c/generic/task.c

@@ -47 +47 @@
 task_id_t task_get_id(void)
 {
+#ifdef __32_BITS__
         task_id_t task_id;
         (void) __SYSCALL1(SYS_TASK_GET_ID, (sysarg_t) &task_id);
         
         return task_id;
+#endif  /* __32_BITS__ */
+        
+#ifdef __64_BITS__
+        return (task_id_t) __SYSCALL0(SYS_TASK_GET_ID);
+#endif  /* __64_BITS__ */
 }
 
@@ -211 +217 @@
 int task_wait(task_id_t id, task_exit_t *texit, int *retval)
 {
-        ipcarg_t te, rv;
+        sysarg_t te, rv;
         int rc;