diff options
| author | Vicent Marti <vicent@github.com> | 2014-05-19 12:20:31 +0200 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-05-19 12:20:31 +0200 |
| commit | 138af33717063df8221a44a056370fbcc6c5291b (patch) | |
| tree | a7daa37e1a289ec45632c3211e7779ef50655ee3 | |
| parent | b2a4be1d42bf5e3433f0a97c2e80ce37d169cf55 (diff) | |
| parent | f5dd2a289106c74647d35560eee55a48ff0f123f (diff) | |
| download | libgit2-138af33717063df8221a44a056370fbcc6c5291b.tar.gz | |
Merge pull request #2303 from jacquesg/mingw-lseek
WIP: Windows fixes
| -rw-r--r-- | src/attrcache.c | 2 | ||||
| -rw-r--r-- | src/global.c | 2 | ||||
| -rw-r--r-- | src/win32/mingw-compat.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/attrcache.c b/src/attrcache.c index 56c028e60..b4579bfc0 100644 --- a/src/attrcache.c +++ b/src/attrcache.c @@ -53,7 +53,7 @@ int git_attr_cache__alloc_file_entry( cachesize++; } - ce = git_pool_mallocz(pool, cachesize); + ce = git_pool_mallocz(pool, (uint32_t)cachesize); GITERR_CHECK_ALLOC(ce); if (baselen) { diff --git a/src/global.c b/src/global.c index 4dfdcf438..7da31853e 100644 --- a/src/global.c +++ b/src/global.c @@ -76,7 +76,7 @@ static void git__shutdown(void) #if defined(GIT_THREADS) && defined(GIT_WIN32) static DWORD _tls_index; -static DWORD _mutex = 0; +static volatile LONG _mutex = 0; static int synchronized_threads_init() { diff --git a/src/win32/mingw-compat.h b/src/win32/mingw-compat.h index 8f51d6f5a..059e39cbc 100644 --- a/src/win32/mingw-compat.h +++ b/src/win32/mingw-compat.h @@ -10,6 +10,7 @@ #if defined(__MINGW32__) /* use a 64-bit file offset type */ +# undef lseek # define lseek _lseeki64 # undef stat # define stat _stati64 |