Changeset 2b3dd78 in mainline for uspace/app/viewer/viewer.c

Timestamp:

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

• uspace/app/viewer/viewer.c (modified) (2 diffs)

uspace/app/viewer/viewer.c

@@ -44 +44 @@
 #include <codec/tga.h>
 #include <task.h>
+#include <str.h>
 
 #define NAME  "viewer"
@@ -114 +115 @@
                 return false;
         
-        struct stat stat;
+        vfs_stat_t stat;
         rc = vfs_stat(fd, &stat);
         if (rc != EOK) {