diff options
| author | Vicent Martà <vicent@github.com> | 2013-10-03 08:18:41 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-10-03 08:18:41 -0700 |
| commit | 146b4d1c5f98aa14df086503f996d131d40b92f8 (patch) | |
| tree | f309e77ce7de8e1de85eb2f9b01f5e71c782bbe8 /include/git2 | |
| parent | ab1368766240cfe861729642abe1cddd01c0203e (diff) | |
| parent | 7baa7631eab48fba1427b0c7b4b109da09dd050b (diff) | |
| download | libgit2-146b4d1c5f98aa14df086503f996d131d40b92f8.tar.gz | |
Merge pull request #1888 from jamill/network_cancellation
network cancellation improvements
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/pack.h | 2 | ||||
| -rw-r--r-- | include/git2/push.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/pack.h b/include/git2/pack.h index 7ebdd5cf3..748817666 100644 --- a/include/git2/pack.h +++ b/include/git2/pack.h @@ -158,7 +158,7 @@ GIT_EXTERN(uint32_t) git_packbuilder_object_count(git_packbuilder *pb); GIT_EXTERN(uint32_t) git_packbuilder_written(git_packbuilder *pb); /** Packbuilder progress notification function */ -typedef void (*git_packbuilder_progress)( +typedef int (*git_packbuilder_progress)( int stage, unsigned int current, unsigned int total, diff --git a/include/git2/push.h b/include/git2/push.h index ecfd862d4..77ef74039 100644 --- a/include/git2/push.h +++ b/include/git2/push.h @@ -40,7 +40,7 @@ typedef struct { #define GIT_PUSH_OPTIONS_INIT { GIT_PUSH_OPTIONS_VERSION } /** Push network progress notification function */ -typedef void (*git_push_transfer_progress)( +typedef int (*git_push_transfer_progress)( unsigned int current, unsigned int total, size_t bytes, |