diff options
author | Ben Straub <bs@github.com> | 2012-12-05 03:11:26 +0400 |
---|---|---|
committer | Ben Straub <bs@github.com> | 2012-12-05 03:11:26 +0400 |
commit | ed8c978b49ca5b5e5becd37cc8d71e086217672d (patch) | |
tree | 32a2c8195bbdf99dc8063204eef42a66b0418ed1 /LibGit2Sharp/ContentChanges.cs | |
parent | 3db1f92f630febc6ee2c76e891faf64e1dae0e8e (diff) |
Update libgit2 binaries to 16e6cee
https://github.com/libgit2/libgit2/compare/1e99ce9...16e6cee
Diffstat (limited to 'LibGit2Sharp/ContentChanges.cs')
-rw-r--r-- | LibGit2Sharp/ContentChanges.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/LibGit2Sharp/ContentChanges.cs b/LibGit2Sharp/ContentChanges.cs index 8f577be6..3033bb86 100644 --- a/LibGit2Sharp/ContentChanges.cs +++ b/LibGit2Sharp/ContentChanges.cs @@ -23,7 +23,7 @@ namespace LibGit2Sharp options, FileCallback, HunkCallback, LineCallback); } - private int FileCallback(IntPtr data, GitDiffDelta delta, float progress) + private int FileCallback(GitDiffDelta delta, float progress, IntPtr payload) { IsBinaryComparison = delta.IsBinary(); @@ -37,17 +37,17 @@ namespace LibGit2Sharp return 0; } - private int HunkCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, IntPtr header, uint headerlen) + private int HunkCallback(GitDiffDelta delta, GitDiffRange range, IntPtr header, UIntPtr headerlen, IntPtr payload) { - string decodedContent = Utf8Marshaler.FromNative(header, headerlen); + string decodedContent = Utf8Marshaler.FromNative(header, (uint)headerlen); AppendToPatch(decodedContent); return 0; } - private int LineCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, uint contentlen) + private int LineCallback(GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, UIntPtr contentlen, IntPtr payload) { - string decodedContent = Utf8Marshaler.FromNative(content, contentlen); + string decodedContent = Utf8Marshaler.FromNative(content, (uint)contentlen); string prefix; |