AOSP: build mke2fs for windows using android mingw library

[tools/e2fsprogs.git] / lib / ext2fs / brel_ma.c

diff --git a/lib/ext2fs/brel_ma.c b/lib/ext2fs/brel_ma.c
index 1c4f218..a12afae 100644 (file)
--- a/lib/ext2fs/brel_ma.c
+++ b/lib/ext2fs/brel_ma.c
@@ -7,11 +7,12 @@
  * module isn't really used yet.)
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#include "config.h"
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
@@ -26,24 +27,24 @@
 #include "ext2fs.h"
 #include "brel.h"
 
-static errcode_t bma_put(ext2_brel brel, blk_t old,
+static errcode_t bma_put(ext2_brel brel, blk64_t old,
                        struct ext2_block_relocate_entry *ent);
-static errcode_t bma_get(ext2_brel brel, blk_t old,
+static errcode_t bma_get(ext2_brel brel, blk64_t old,
                        struct ext2_block_relocate_entry *ent);
 static errcode_t bma_start_iter(ext2_brel brel);
-static errcode_t bma_next(ext2_brel brel, blk_t *old,
+static errcode_t bma_next(ext2_brel brel, blk64_t *old,
                         struct ext2_block_relocate_entry *ent);
-static errcode_t bma_move(ext2_brel brel, blk_t old, blk_t new);
-static errcode_t bma_delete(ext2_brel brel, blk_t old);
+static errcode_t bma_move(ext2_brel brel, blk64_t old, blk64_t new);
+static errcode_t bma_delete(ext2_brel brel, blk64_t old);
 static errcode_t bma_free(ext2_brel brel);
 
 struct brel_ma {
        __u32 magic;
-       blk_t max_block;
+       blk64_t max_block;
        struct ext2_block_relocate_entry *entries;
 };
 
-errcode_t ext2fs_brel_memarray_create(char *name, blk_t max_block,
+errcode_t ext2fs_brel_memarray_create(char *name, blk64_t max_block,
                                      ext2_brel *new_brel)
 {
        ext2_brel               brel = 0;
@@ -101,7 +102,7 @@ errout:
        return retval;
 }
 
-static errcode_t bma_put(ext2_brel brel, blk_t old,
+static errcode_t bma_put(ext2_brel brel, blk64_t old,
                        struct ext2_block_relocate_entry *ent)
 {
        struct brel_ma  *ma;
@@ -113,7 +114,7 @@ static errcode_t bma_put(ext2_brel brel, blk_t old,
        return 0;
 }
 
-static errcode_t bma_get(ext2_brel brel, blk_t old,
+static errcode_t bma_get(ext2_brel brel, blk64_t old,
                        struct ext2_block_relocate_entry *ent)
 {
        struct brel_ma  *ma;
@@ -133,7 +134,7 @@ static errcode_t bma_start_iter(ext2_brel brel)
        return 0;
 }
 
-static errcode_t bma_next(ext2_brel brel, blk_t *old,
+static errcode_t bma_next(ext2_brel brel, blk64_t *old,
                          struct ext2_block_relocate_entry *ent)
 {
        struct brel_ma  *ma;
@@ -150,7 +151,7 @@ static errcode_t bma_next(ext2_brel brel, blk_t *old,
        return 0;
 }
 
-static errcode_t bma_move(ext2_brel brel, blk_t old, blk_t new)
+static errcode_t bma_move(ext2_brel brel, blk64_t old, blk64_t new)
 {
        struct brel_ma  *ma;
 
@@ -164,7 +165,7 @@ static errcode_t bma_move(ext2_brel brel, blk_t old, blk_t new)
        return 0;
 }
 
-static errcode_t bma_delete(ext2_brel brel, blk_t old)
+static errcode_t bma_delete(ext2_brel brel, blk64_t old)
 {
        struct brel_ma  *ma;