diff options
Diffstat (limited to 'src/diff_output.h')
| -rw-r--r-- | src/diff_output.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/diff_output.h b/src/diff_output.h index f74dd3a71..13f2a120d 100644 --- a/src/diff_output.h +++ b/src/diff_output.h @@ -27,12 +27,12 @@ typedef struct { git_repository *repo; git_diff_list *diff; const git_diff_options *opts; - git_diff_file_fn file_cb; - git_diff_hunk_fn hunk_cb; - git_diff_data_fn data_cb; - void *cb_data; - int cb_error; - git_diff_range cb_range; + git_diff_file_cb file_cb; + git_diff_hunk_cb hunk_cb; + git_diff_data_cb data_cb; + void *payload; + int error; + git_diff_range range; xdemitconf_t xdiff_config; xpparam_t xdiff_params; } diff_context; @@ -86,7 +86,7 @@ typedef struct { extern int git_diff__paired_foreach( git_diff_list *idx2head, git_diff_list *wd2idx, - int (*cb)(void *cbref, git_diff_delta *i2h, git_diff_delta *w2i), - void *cbref); + int (*cb)(git_diff_delta *i2h, git_diff_delta *w2i, void *payload), + void *payload); #endif |