Changeset ab936440 in mainline for kernel/generic/include/macros.h


Ignore:
Timestamp:
2019-02-12T20:42:42Z (6 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f31ca47
Parents:
7f7817a9 (diff), 4805495 (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.
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)
Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/macros.h

    r7f7817a9 rab936440  
    4949 *
    5050 */
    51 NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
     51_NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
    5252    uint64_t sz2)
    5353{
    … …  
    7878 *
    7979 */
    80 NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
     80_NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
    8181    uint64_t sz2)
    8282{
Note: See TracChangeset for help on using the changeset viewer.