From 85a5e8ebe171afa948e0ad18fe3769e0fe1244b5 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Wed, 17 Jun 2015 09:00:23 -0700 Subject: Fixed Xcode 6.1 build warnings --- src/path.c | 2 +- src/unix/posix.h | 1 + tests/checkout/checkout_helpers.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/path.c b/src/path.c index c04b50622..c2c90e48d 100644 --- a/src/path.c +++ b/src/path.c @@ -891,7 +891,7 @@ void git_path_iconv_clear(git_path_iconv_t *ic) int git_path_iconv(git_path_iconv_t *ic, const char **in, size_t *inlen) { - char *nfd = *in, *nfc; + char *nfd = (char*)*in, *nfc; size_t nfdlen = *inlen, nfclen, wantlen = nfdlen, alloclen, rv; int retry = 1; diff --git a/src/unix/posix.h b/src/unix/posix.h index 425e6bb1b..c852936be 100644 --- a/src/unix/posix.h +++ b/src/unix/posix.h @@ -10,6 +10,7 @@ #include #include #include +#include typedef int GIT_SOCKET; #define INVALID_SOCKET -1 diff --git a/tests/checkout/checkout_helpers.c b/tests/checkout/checkout_helpers.c index f6e36d39b..42ed1db2a 100644 --- a/tests/checkout/checkout_helpers.c +++ b/tests/checkout/checkout_helpers.c @@ -132,7 +132,6 @@ int checkout_count_callback( void tick_index(git_index *index) { - int index_fd; git_time_t ts; struct timeval times[2]; -- cgit v1.2.1