diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2012-05-20 18:30:11 +0400 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2012-05-21 16:08:24 +0400 |
| commit | 91a1121ab5b6e174c732f27133806ff81f6e5354 (patch) | |
| tree | ca5b3c24cfeba26a0f81942a8fb96dbb0e46eda6 | |
| parent | 6d1711ab61db1d67aaee27f779f86de43fed8cf2 (diff) | |
Fix marshaling of diff functions
| -rw-r--r-- | LibGit2Sharp/Core/NativeMethods.cs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs index 0b7a11cf..ffe53751 100644 --- a/LibGit2Sharp/Core/NativeMethods.cs +++ b/LibGit2Sharp/Core/NativeMethods.cs @@ -228,24 +228,26 @@ namespace LibGit2Sharp.Core public static extern int git_diff_index_to_tree( RepositorySafeHandle repo, GitDiffOptions options, - IntPtr oldTree, - out IntPtr diff); + GitObjectSafeHandle oldTree, + out DiffListSafeHandle diff); + + [DllImport(libgit2)] + public static extern int git_diff_merge( + DiffListSafeHandle onto, + DiffListSafeHandle from); [DllImport(libgit2)] public static extern int git_diff_workdir_to_index( RepositorySafeHandle repo, GitDiffOptions options, - out IntPtr diff); + out DiffListSafeHandle diff); [DllImport(libgit2)] public static extern int git_diff_workdir_to_tree( RepositorySafeHandle repo, GitDiffOptions options, - IntPtr oldTree, - out IntPtr diff); - - [DllImport(libgit2)] - public static extern int git_diff_merge(IntPtr onto, IntPtr from); + GitObjectSafeHandle oldTree, + out DiffListSafeHandle diff); internal delegate int git_diff_file_fn( IntPtr data, |