Merge remote-tracking branch 'nulltoken/topic/amd64-compat' into development

Conflicts:
	src/netops.c
	src/netops.h
	src/oid.c

1 files changed, 1 insertions, 1 deletions

diff --git a/src/oid.c b/src/oid.c
index 556a2cf85..821442d19 100644
--- a/src/oid.c
+++ b/src/oid.c
@@ -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;