diff options
| author | Matthew Bowen <matthew@mgbowen.com> | 2013-12-09 10:43:05 -0500 |
|---|---|---|
| committer | Matthew Bowen <mabowen@lexmark.com> | 2013-12-09 10:44:26 -0500 |
| commit | 0db932254741934afcdb04e644c31ff86db0d58c (patch) | |
| tree | 6c5a2faa06751c8b0c1b6b870dc8b9a87303225c /include/git2/merge.h | |
| parent | 07c5dc84fd486b380d618319b4852591d355bd81 (diff) | |
| download | libgit2-0db932254741934afcdb04e644c31ff86db0d58c.tar.gz | |
Fix GIT_MERGE_OPTS_INIT on MSVC.
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 8a1dfec2e..610b0d509 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -85,7 +85,7 @@ typedef struct { } git_merge_opts; #define GIT_MERGE_OPTS_VERSION 1 -#define GIT_MERGE_OPTS_INIT {GIT_MERGE_OPTS_VERSION, 0, GIT_MERGE_TREE_OPTS_INIT, GIT_CHECKOUT_OPTS_INIT} +#define GIT_MERGE_OPTS_INIT {GIT_MERGE_OPTS_VERSION, (git_merge_flags_t)0, GIT_MERGE_TREE_OPTS_INIT, GIT_CHECKOUT_OPTS_INIT} /** |