Changeset 2b3dd78 in mainline for uspace/lib/block/block.h


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/block/block.h

    ra0a9cc2 r2b3dd78  
    8585        /** Link for placing the block into the free block list. */
    8686        link_t free_link;
    87         /** Link for placing the block into the block hash table. */ 
     87        /** Link for placing the block into the block hash table. */
    8888        ht_link_t hash_link;
    8989        /** Buffer with the block data. */
Note: See TracChangeset for help on using the changeset viewer.