diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-31 09:38:06 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-31 11:08:31 -0700 |
| commit | 7f930ded88b2adda94423a618e268700494dc5c0 (patch) | |
| tree | 0f1b80f4e054008a85c0bca4c7344e7549460672 /src/merge_file.c | |
| parent | 336e89572192b75b803970f316417d5f5309ee7b (diff) | |
| download | libgit2-7f930ded88b2adda94423a618e268700494dc5c0.tar.gz | |
Const up members of git_merge_file_result
Diffstat (limited to 'src/merge_file.c')
| -rw-r--r-- | src/merge_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merge_file.c b/src/merge_file.c index fc45cbfbf..ab9ca4168 100644 --- a/src/merge_file.c +++ b/src/merge_file.c @@ -272,8 +272,8 @@ void git_merge_file_result_free(git_merge_file_result *result) if (result == NULL) return; - git__free(result->path); + git__free((char *)result->path); /* xdiff uses malloc() not git_malloc, so we use free(), not git_free() */ - free(result->ptr); + free((char *)result->ptr); } |