diff options
| author | Pierre-Olivier Latour <pol@mac.com> | 2015-06-17 09:00:23 -0700 |
|---|---|---|
| committer | Pierre-Olivier Latour <pol@mac.com> | 2015-06-17 09:00:23 -0700 |
| commit | 85a5e8ebe171afa948e0ad18fe3769e0fe1244b5 (patch) | |
| tree | 7d08691ee769afbef520e4d80666490e13383f2e /src | |
| parent | 83a04a69da717aee7f313433b6b1eb7e3c4ebdec (diff) | |
| download | libgit2-85a5e8ebe171afa948e0ad18fe3769e0fe1244b5.tar.gz | |
Fixed Xcode 6.1 build warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/path.c | 2 | ||||
| -rw-r--r-- | src/unix/posix.h | 1 |
2 files changed, 2 insertions, 1 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 <stdio.h> #include <dirent.h> #include <sys/param.h> +#include <sys/time.h> typedef int GIT_SOCKET; #define INVALID_SOCKET -1 |