Changeset 2b3dd78 in mainline for abi/include


Ignore:
Timestamp:
2018-01-31T12:02:00Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5595841
Parents:
a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

Location:
abi/include/abi
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • abi/include/abi/ipc/methods.h

    ra0a9cc2 r2b3dd78  
    108108         *
    109109         * - ARG1 - source user page address
    110          */ 
     110         */
    111111        IPC_M_PAGE_IN,
    112112

  • abi/include/abi/proc/uarg.h

    ra0a9cc2 r2b3dd78  
    4444        size_t uspace_stack_size;
    4545       
    46         void (* uspace_thread_function)(void *);
     46        void (*uspace_thread_function)(void *);
    4747        void *uspace_thread_arg;
    4848       
Note: See TracChangeset for help on using the changeset viewer.