diff options
author | Vicent Marti <tanoku@gmail.com> | 2012-08-02 01:38:30 +0200 |
---|---|---|
committer | Vicent Marti <tanoku@gmail.com> | 2012-08-02 01:38:30 +0200 |
commit | e25dda51c4dc47ed99f95dae6486c6275b119484 (patch) | |
tree | 183114622aa2dfeb224b550a07050f26cd9a0732 /src/oid.c | |
parent | 95a1d876148ff2e09c13537c60e1dc7e10ea9295 (diff) | |
parent | b8457baae24269c9fb777591e2a0e1b425ba31b6 (diff) | |
download | libgit2-e25dda51c4dc47ed99f95dae6486c6275b119484.tar.gz |
Merge remote-tracking branch 'nulltoken/topic/amd64-compat' into development
Conflicts:
src/netops.c
src/netops.h
src/oid.c
Diffstat (limited to 'src/oid.c')
-rw-r--r-- | src/oid.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -161,7 +161,7 @@ void git_oid_cpy(git_oid *out, const git_oid *src) memcpy(out->id, src->id, sizeof(out->id)); } -int git_oid_ncmp(const git_oid *oid_a, const git_oid *oid_b, unsigned int len) +int git_oid_ncmp(const git_oid *oid_a, const git_oid *oid_b, size_t len) { const unsigned char *a = oid_a->id; const unsigned char *b = oid_b->id; |