diff options
| author | Russell Belfer <rb@github.com> | 2014-03-31 13:31:01 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2014-03-31 13:31:01 -0700 |
| commit | 7dcd42a55f5fdc61e8e8de472ec54ccc0613e23c (patch) | |
| tree | b5360032f1fee25f32d05df807359b7430047b29 | |
| parent | c856f8c503a59ab6c8cc974d467aa2fcf509fd9b (diff) | |
| download | libgit2-7dcd42a55f5fdc61e8e8de472ec54ccc0613e23c.tar.gz | |
Cleanups
| -rw-r--r-- | src/iterator.c | 2 | ||||
| -rw-r--r-- | src/merge_file.c | 4 | ||||
| -rw-r--r-- | src/submodule.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/iterator.c b/src/iterator.c index 1276903a7..a7a44914c 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -10,7 +10,7 @@ #include "index.h" #include "ignore.h" #include "buffer.h" -#include "git2/submodule.h" +#include "submodule.h" #include <ctype.h> #define ITERATOR_SET_CB(P,NAME_LC) do { \ diff --git a/src/merge_file.c b/src/merge_file.c index ab9ca4168..ff0364432 100644 --- a/src/merge_file.c +++ b/src/merge_file.c @@ -117,7 +117,7 @@ static int git_merge_file__from_inputs( 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)); @@ -165,7 +165,7 @@ static int git_merge_file__from_inputs( } 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); diff --git a/src/submodule.h b/src/submodule.h index 8199eb1da..1c41897e3 100644 --- a/src/submodule.h +++ b/src/submodule.h @@ -120,7 +120,7 @@ enum { ((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( |