Changeset 25eec4e in mainline for uspace/srv/fs/fat/fat_dentry.h

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

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

uspace/srv/fs/fat/fat_dentry.h

@@ -36 +36 @@
 
 #include <stdint.h>
-#include <bool.h>
+#include <stdbool.h>
+#include <sys/types.h>
 
 #define IS_D_CHAR(ch) (isalnum(ch) || ch == '_')
@@ -132 +133 @@
 } __attribute__ ((packed)) fat_dentry_t;
 
-
 extern int fat_dentry_namecmp(char *, const char *);
 extern void fat_dentry_name_get(const fat_dentry_t *, char *);
@@ -139 +139 @@
 extern uint8_t fat_dentry_chksum(uint8_t *);
 
-extern size_t fat_lfn_str_nlength(const uint16_t *, size_t);
+extern size_t fat_lfn_str_nlength(const unaligned_uint16_t *, size_t);
 extern size_t fat_lfn_size(const fat_dentry_t *);
 extern size_t fat_lfn_get_entry(const fat_dentry_t *, uint16_t *, size_t *);