Changeset 03362fbd in mainline for uspace/srv/fs/fat/fat.h

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/srv/fs/fat/fat.h (modified) (2 diffs)

uspace/srv/fs/fat/fat.h

@@ -40 +40 @@
 #include <atomic.h>
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include "../../vfs/vfs.h"
 
@@ -190 +190 @@
 typedef struct {
         /** Used indices (position) hash table link. */
-        link_t          uph_link;
+        ht_link_t               uph_link;
         /** Used indices (index) hash table link. */
-        link_t          uih_link;
+        ht_link_t               uih_link;
 
         fibril_mutex_t  lock;