Ignore:
Timestamp:
2018-01-31T12:02:00Z (7 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/ia32/include/libarch/syscall.h

    ra0a9cc2 r2b3dd78  
    4848#define __syscall6  __syscall_slow
    4949
    50 extern sysarg_t (* __syscall_fast_func)(const sysarg_t, const sysarg_t,
     50extern sysarg_t (*__syscall_fast_func)(const sysarg_t, const sysarg_t,
    5151    const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t,
    5252    const syscall_t);
Note: See TracChangeset for help on using the changeset viewer.