Merge branch 'mainlining'

[yaffs2.git] / utils / mkyaffs2image.c

diff --git a/utils/mkyaffs2image.c b/utils/mkyaffs2image.c
index 2d2da437a0c2c63c9e312796df91fb0aecf9975d..fa2229bbd06bc4131f30d7248fc3ef7ba2ef33b0 100644 (file)
--- a/utils/mkyaffs2image.c
+++ b/utils/mkyaffs2image.c
@@ -172,7 +172,7 @@ static void little_to_big_endian(struct yaffs_ext_tags *tagsPtr)
 #endif
 }
 
-static void shuffle_oob(char *spareData, yaffs_packed_tags2 *pt)
+static void shuffle_oob(char *spareData, struct yaffs_packed_tags2 *pt)
 {
        assert(sizeof(*pt) <= spareSize);
        // NAND LAYOUT: For non-trivial OOB orderings, here would be a good place to shuffle.
@@ -182,7 +182,7 @@ static void shuffle_oob(char *spareData, yaffs_packed_tags2 *pt)
 static int write_chunk(u8 *data, u32 id, u32 chunk_id, u32 n_bytes)
 {
        struct yaffs_ext_tags t;
-       yaffs_packed_tags2 pt;
+       struct yaffs_packed_tags2 pt;
        char spareData[spareSize];
 
        if (write(outFile,data,chunkSize) != chunkSize)