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 /include/git2/index.h | |
| 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 'include/git2/index.h')
| -rw-r--r-- | include/git2/index.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/index.h b/include/git2/index.h index f863a6065..0093330e2 100644 --- a/include/git2/index.h +++ b/include/git2/index.h @@ -279,7 +279,7 @@ GIT_EXTERN(int) git_index_remove(git_index *index, int position); * @param n the position of the entry * @return a pointer to the entry; NULL if out of bounds */ -GIT_EXTERN(git_index_entry *) git_index_get(git_index *index, unsigned int n); +GIT_EXTERN(git_index_entry *) git_index_get(git_index *index, size_t n); /** * Get the count of entries currently in the index @@ -319,7 +319,7 @@ GIT_EXTERN(const git_index_entry_unmerged *) git_index_get_unmerged_bypath(git_i * @param n the position of the entry * @return a pointer to the unmerged entry; NULL if out of bounds */ -GIT_EXTERN(const git_index_entry_unmerged *) git_index_get_unmerged_byindex(git_index *index, unsigned int n); +GIT_EXTERN(const git_index_entry_unmerged *) git_index_get_unmerged_byindex(git_index *index, size_t n); /** * Return the stage number from a git index entry |