Fixed Xcode 6.1 build warnings

diff --git a/src/path.c b/src/path.c
index c04b506224151165a0f8531bad6a3e4e2dcaafbb..c2c90e48d78c49ad2b9d57f182a9445c94137a7a 100644 (file)
--- 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 425e6bb1b271c4f13baa0c4b4a2af816073a52ad..c852936be1f0ffe2d523e5d5ab45e756380955fc 100644 (file)
--- a/src/unix/posix.h
+++ b/src/unix/posix.h
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <dirent.h>
 #include <sys/param.h>
+#include <sys/time.h>
 
 typedef int GIT_SOCKET;
 #define INVALID_SOCKET -1

diff --git a/tests/checkout/checkout_helpers.c b/tests/checkout/checkout_helpers.c
index f6e36d39b4503ed7321853eeccecd4a78e4d2c94..42ed1db2a75a51a67d4b7e1dcaf46603feb25e1b 100644 (file)
--- 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];