memset(out, 0x0, sizeof(git_merge_file_result));
- merge_file_normalize_opts(&options, given_opts);
+ merge_file_normalize_opts(&options, given_opts);
memset(&xmparam, 0x0, sizeof(xmparam_t));
}
out->automergeable = (xdl_result == 0);
- out->ptr = (unsigned char *)mmbuffer.ptr;
+ out->ptr = (const char *)mmbuffer.ptr;
out->len = mmbuffer.size;
out->mode = merge_file_best_mode(ancestor, ours, theirs);
((S) & ~(0xFFFFFFFFu << 20))
/* Internal submodule check does not attempt to refresh cached data */
-bool git_submodule__is_submodule(git_repository *repo, const char *name);
+extern bool git_submodule__is_submodule(git_repository *repo, const char *name);
/* Internal status fn returns status and optionally the various OIDs */
extern int git_submodule__status(