diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-17 21:36:27 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-17 21:36:27 +0200 |
| commit | 6e0470e0f573b5ccecaa5048d906c1c80239333a (patch) | |
| tree | 7d08691ee769afbef520e4d80666490e13383f2e | |
| parent | 83a04a69da717aee7f313433b6b1eb7e3c4ebdec (diff) | |
| parent | 85a5e8ebe171afa948e0ad18fe3769e0fe1244b5 (diff) | |
| download | libgit2-6e0470e0f573b5ccecaa5048d906c1c80239333a.tar.gz | |
Merge pull request #3229 from git-up/build_warnings
Fixed Xcode 6.1 build warnings
| -rw-r--r-- | src/path.c | 2 | ||||
| -rw-r--r-- | src/unix/posix.h | 1 | ||||
| -rw-r--r-- | 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 <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 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]; |