Skip to content

G
git2
Commit 138af337 by Vicent Marti
Options

Merge pull request #2303 from jacquesg/mingw-lseek 

WIP: Windows fixes
parents b2a4be1d f5dd2a28
Showing with 3 additions and 2 deletions
src/attrcache.c
...@@ -53,7 +53,7 @@ int git_attr_cache__alloc_file_entry( ...@@ -53,7 +53,7 @@ int git_attr_cache__alloc_file_entry(
cachesize++; cachesize++;
} }
ce = git_pool_mallocz(pool, cachesize); ce = git_pool_mallocz(pool, (uint32_t)cachesize);
GITERR_CHECK_ALLOC(ce); GITERR_CHECK_ALLOC(ce);
if (baselen) { if (baselen) {
......
src/global.c
...@@ -76,7 +76,7 @@ static void git__shutdown(void) ...@@ -76,7 +76,7 @@ static void git__shutdown(void)
#if defined(GIT_THREADS) && defined(GIT_WIN32) #if defined(GIT_THREADS) && defined(GIT_WIN32)
static DWORD _tls_index; static DWORD _tls_index;
static DWORD _mutex = 0; static volatile LONG _mutex = 0;
static int synchronized_threads_init() static int synchronized_threads_init()
{ {
......
src/win32/mingw-compat.h
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#if defined(__MINGW32__) #if defined(__MINGW32__)
/* use a 64-bit file offset type */ /* use a 64-bit file offset type */
# undef lseek
# define lseek _lseeki64 # define lseek _lseeki64
# undef stat # undef stat
# define stat _stati64 # define stat _stati64
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment