summaryrefslogtreecommitdiff
path: root/include/git2/tree.h
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2012-08-02 01:38:30 +0200
committerVicent Marti <tanoku@gmail.com>2012-08-02 01:38:30 +0200
commite25dda51c4dc47ed99f95dae6486c6275b119484 (patch)
tree183114622aa2dfeb224b550a07050f26cd9a0732 /include/git2/tree.h
parent95a1d876148ff2e09c13537c60e1dc7e10ea9295 (diff)
parentb8457baae24269c9fb777591e2a0e1b425ba31b6 (diff)
downloadlibgit2-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 'include/git2/tree.h')
-rw-r--r--include/git2/tree.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/tree.h b/include/git2/tree.h
index f12b15e2e..014097b12 100644
--- a/include/git2/tree.h
+++ b/include/git2/tree.h
@@ -50,7 +50,7 @@ GIT_INLINE(int) git_tree_lookup_prefix(
git_tree **tree,
git_repository *repo,
const git_oid *id,
- unsigned int len)
+ size_t len)
{
return git_object_lookup_prefix((git_object **)tree, repo, id, len, GIT_OBJ_TREE);
}
@@ -126,7 +126,7 @@ GIT_EXTERN(const git_tree_entry *) git_tree_entry_byname(git_tree *tree, const c
* @param idx the position in the entry list
* @return the tree entry; NULL if not found
*/
-GIT_EXTERN(const git_tree_entry *) git_tree_entry_byindex(git_tree *tree, unsigned int idx);
+GIT_EXTERN(const git_tree_entry *) git_tree_entry_byindex(git_tree *tree, size_t idx);
/**
* Get the UNIX file attributes of a tree entry