Changeset 49160c4 in mainline

Timestamp:

2011-08-16T19:17:09Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2aadf2b

Parents:

db6e419

Message:

Resolved conflicts caused by mainline merge.

Location:

uspace/lib/posix

Files:

• stdio.c (modified) (1 diff)
• sys/stat.c (modified) (1 diff)

uspace/lib/posix/stdio.c

@@ -284 +284 @@
         fdi_node_t node = {
                 .fs_handle = st.fs_handle,
-                .devmap_handle = st.devmap_handle,
+                .service_id = st.service_id,
                 .index = st.index
         };

uspace/lib/posix/sys/stat.c

@@ -52 +52 @@
         memset(dest, 0, sizeof(struct posix_stat));
         
-        dest->st_dev = src->device;
+        dest->st_dev = src->service;
         dest->st_ino = src->index;