Changeset 4c53333 in mainline for uspace/srv/vfs/vfs.h

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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 mainline changes

File:

• uspace/srv/vfs/vfs.h (modified) (2 diffs)

uspace/srv/vfs/vfs.h

@@ -36 +36 @@
 #include <async.h>
 #include <adt/list.h>
+#include <adt/hash_table.h>
 #include <fibril_synch.h>
 #include <sys/types.h>
 #include <loc.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <ipc/vfs.h>
 #include <task.h>
@@ -112 +113 @@
         unsigned lnkcnt;
 
-        link_t nh_link;         /**< Node hash-table link. */
+        ht_link_t nh_link;              /**< Node hash-table link. */
 
         vfs_node_type_t type;   /**< Partial info about the node type. */