diff options
author | Vicent Marti <tanoku@gmail.com> | 2012-08-02 03:38:30 +0400 |
---|---|---|
committer | Vicent Marti <tanoku@gmail.com> | 2012-08-02 03:38:30 +0400 |
commit | e25dda51c4dc47ed99f95dae6486c6275b119484 (patch) | |
tree | 183114622aa2dfeb224b550a07050f26cd9a0732 /src/odb_pack.c | |
parent | 95a1d876148ff2e09c13537c60e1dc7e10ea9295 (diff) | |
parent | b8457baae24269c9fb777591e2a0e1b425ba31b6 (diff) |
Merge remote-tracking branch 'nulltoken/topic/amd64-compat' into development
Conflicts:
src/netops.c
src/netops.h
src/oid.c
Diffstat (limited to 'src/odb_pack.c')
-rw-r--r-- | src/odb_pack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/odb_pack.c b/src/odb_pack.c index 0f34ebdf8..bbfadccb2 100644 --- a/src/odb_pack.c +++ b/src/odb_pack.c @@ -149,7 +149,7 @@ static int pack_entry_find_prefix( struct git_pack_entry *e, struct pack_backend *backend, const git_oid *short_oid, - unsigned int len); + size_t len); @@ -295,7 +295,7 @@ static int pack_entry_find_prefix( struct git_pack_entry *e, struct pack_backend *backend, const git_oid *short_oid, - unsigned int len) + size_t len) { int error; unsigned int i; @@ -384,7 +384,7 @@ static int pack_backend__read_prefix( git_otype *type_p, git_odb_backend *backend, const git_oid *short_oid, - unsigned int len) + size_t len) { int error = 0; |