summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPierre-Olivier Latour <pol@mac.com>2015-06-02 08:36:15 -0700
committerPierre-Olivier Latour <pol@mac.com>2015-06-02 11:49:38 -0700
commit9f3c18e2ac082454c955761f10f4a0d06390c27f (patch)
tree05ad8c3289df5f6ea3583127db3395aa9314b944 /src
parentbe5fda75879f7ed89c7a72adc257872d1ea13803 (diff)
downloadlibgit2-9f3c18e2ac082454c955761f10f4a0d06390c27f.tar.gz
Fixed build warnings on Xcode 6.1
Diffstat (limited to 'src')
-rw-r--r--src/odb.c2
-rw-r--r--src/transports/cred.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/odb.c b/src/odb.c
index deb9d5c82..7a718f5d6 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -53,7 +53,7 @@ static int load_alternates(git_odb *odb, const char *objects_dir, int alternate_
int git_odb__format_object_header(char *hdr, size_t n, git_off_t obj_len, git_otype obj_type)
{
const char *type_str = git_object_type2string(obj_type);
- int len = p_snprintf(hdr, n, "%s %"PRIuZ, type_str, obj_len);
+ int len = p_snprintf(hdr, n, "%s %lld", type_str, obj_len);
assert(len > 0 && len <= (int)n);
return len+1;
}
diff --git a/src/transports/cred.c b/src/transports/cred.c
index 006cd2c52..044b2a262 100644
--- a/src/transports/cred.c
+++ b/src/transports/cred.c
@@ -209,6 +209,12 @@ int git_cred_ssh_key_memory_new(
passphrase,
GIT_CREDTYPE_SSH_MEMORY);
#else
+ GIT_UNUSED(cred);
+ GIT_UNUSED(username);
+ GIT_UNUSED(publickey);
+ GIT_UNUSED(privatekey);
+ GIT_UNUSED(passphrase);
+
giterr_set(GITERR_INVALID,
"This version of libgit2 was not built with ssh memory credentials.");
return -1;