Changeset 46c20c8 in mainline for uspace/app/mkfat/fat.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/app/mkfat/fat.h (modified) (2 diffs)

uspace/app/mkfat/fat.h

@@ -78 +78 @@
                         uint16_t        signature;
                 } __attribute__ ((packed));
-                struct fat32 {
+                struct {
                         /* FAT32 only */
                         /** Sectors per FAT. */
@@ -108 +108 @@
                         /** Signature. */
                         uint16_t        signature;
-                } __attribute__ ((packed));
+                } fat32 __attribute__ ((packed));
         };
 } __attribute__ ((packed)) fat_bs_t;