Ignore:
Timestamp:
2010-12-25T21:20:28Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
631ee0c
Parents:
1bfd3d3 (diff), 09178b7f (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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/include/proc/thread.h

    r1bfd3d3 r973ef9fc  
    241241
    242242/* Thread syscall prototypes. */
    243 extern unative_t sys_thread_create(uspace_arg_t *, char *, size_t,
     243extern sysarg_t sys_thread_create(uspace_arg_t *, char *, size_t,
    244244    thread_id_t *);
    245 extern unative_t sys_thread_exit(int);
    246 extern unative_t sys_thread_get_id(thread_id_t *);
    247 extern unative_t sys_thread_usleep(uint32_t);
     245extern sysarg_t sys_thread_exit(int);
     246extern sysarg_t sys_thread_get_id(thread_id_t *);
     247extern sysarg_t sys_thread_usleep(uint32_t);
    248248
    249249#endif
Note: See TracChangeset for help on using the changeset viewer.