diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-01-17 22:07:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-17 22:07:24 +0000 |
| commit | 4e0c8a1e73124acc62d295df02f7e92e2e8b3dfc (patch) | |
| tree | a389e3efe372ade4c695b9861b3a119f08fe987d /include/git2/sys/merge.h | |
| parent | 6e17bfda57467b32b5709e8d9014eae767810869 (diff) | |
| parent | 38e61797b579f1738e3c48aaf101ad3ddaff4e6b (diff) | |
| download | libgit2-4e0c8a1e73124acc62d295df02f7e92e2e8b3dfc.tar.gz | |
Merge pull request #4930 from libgit2/ethomson/cdecl
Always build a cdecl library
Diffstat (limited to 'include/git2/sys/merge.h')
| -rw-r--r-- | include/git2/sys/merge.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/git2/sys/merge.h b/include/git2/sys/merge.h index f07997d2e..bd0a8a4b7 100644 --- a/include/git2/sys/merge.h +++ b/include/git2/sys/merge.h @@ -73,7 +73,7 @@ GIT_EXTERN(const git_merge_file_options *) git_merge_driver_source_file_options( * initialization operations (in case libgit2 is being used in a way that * doesn't need the merge driver). */ -typedef int (*git_merge_driver_init_fn)(git_merge_driver *self); +typedef int GIT_CALLBACK(git_merge_driver_init_fn)(git_merge_driver *self); /** * Shutdown callback on merge driver @@ -85,7 +85,7 @@ typedef int (*git_merge_driver_init_fn)(git_merge_driver *self); * * Typically this function will free the `git_merge_driver` object itself. */ -typedef void (*git_merge_driver_shutdown_fn)(git_merge_driver *self); +typedef void GIT_CALLBACK(git_merge_driver_shutdown_fn)(git_merge_driver *self); /** * Callback to perform the merge. @@ -105,7 +105,7 @@ typedef void (*git_merge_driver_shutdown_fn)(git_merge_driver *self); * * The `src` contains the data about the file to be merged. */ -typedef int (*git_merge_driver_apply_fn)( +typedef int GIT_CALLBACK(git_merge_driver_apply_fn)( git_merge_driver *self, const char **path_out, uint32_t *mode_out, |