diff options
-rw-r--r-- | include/git2/remote.h | 5 | ||||
-rw-r--r-- | src/transports/smart_protocol.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/git2/remote.h b/include/git2/remote.h index df25e04b7..1d57dcd78 100644 --- a/include/git2/remote.h +++ b/include/git2/remote.h @@ -422,11 +422,12 @@ typedef enum git_remote_completion_type { } git_remote_completion_type; /** Push network progress notification function */ -typedef int GIT_CALLBACK(git_push_transfer_progress)( +typedef int GIT_CALLBACK(git_push_transfer_progress_cb)( unsigned int current, unsigned int total, size_t bytes, void* payload); + /** * Represents an update which will be performed on the remote during push */ @@ -537,7 +538,7 @@ struct git_remote_callbacks { * inline with pack building operations, so performance may be * affected. */ - git_push_transfer_progress push_transfer_progress; + git_push_transfer_progress_cb push_transfer_progress; /** * See documentation of git_push_update_reference_cb diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c index a7add0227..9c93a7f93 100644 --- a/src/transports/smart_protocol.c +++ b/src/transports/smart_protocol.c @@ -978,7 +978,7 @@ struct push_packbuilder_payload { git_smart_subtransport_stream *stream; git_packbuilder *pb; - git_push_transfer_progress cb; + git_push_transfer_progress_cb cb; void *cb_payload; size_t last_bytes; double last_progress_report_time; |