Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 49160c4 in mainline


Ignore:
Timestamp:
2011-08-16T19:17:09Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
2aadf2b
Parents:
db6e419
Message:

Resolved conflicts caused by mainline merge.

Location:
uspace/lib/posix
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/posix/stdio.c

    rdb6e419 r49160c4  
    284284        fdi_node_t node = {
    285285                .fs_handle = st.fs_handle,
    286                 .devmap_handle = st.devmap_handle,
     286                .service_id = st.service_id,
    287287                .index = st.index
    288288        };
  • uspace/lib/posix/sys/stat.c

    rdb6e419 r49160c4  
    5252        memset(dest, 0, sizeof(struct posix_stat));
    5353       
    54         dest->st_dev = src->device;
     54        dest->st_dev = src->service;
    5555        dest->st_ino = src->index;
    5656       
Note: See TracChangeset for help on using the changeset viewer.