mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-29 15:10:02 +00:00
Merge pull request #3229 from git-up/build_warnings
Fixed Xcode 6.1 build warnings
This commit is contained in:
commit
6e0470e0f5
@ -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)
|
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;
|
size_t nfdlen = *inlen, nfclen, wantlen = nfdlen, alloclen, rv;
|
||||||
int retry = 1;
|
int retry = 1;
|
||||||
|
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
|
||||||
typedef int GIT_SOCKET;
|
typedef int GIT_SOCKET;
|
||||||
#define INVALID_SOCKET -1
|
#define INVALID_SOCKET -1
|
||||||
|
@ -132,7 +132,6 @@ int checkout_count_callback(
|
|||||||
|
|
||||||
void tick_index(git_index *index)
|
void tick_index(git_index *index)
|
||||||
{
|
{
|
||||||
int index_fd;
|
|
||||||
git_time_t ts;
|
git_time_t ts;
|
||||||
struct timeval times[2];
|
struct timeval times[2];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user