Merge pull request #2303 from jacquesg/mingw-lseek

WIP: Windows fixes

Merge pull request #2303 from jacquesg/mingw-lseek
WIP: Windows fixes
138af337 · Vicent Marti · b2a4be1d · f5dd2a28 · 138af337 · 138af337
Commit 138af337 authored May 19, 2014 by Vicent Marti
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

src/attrcache.c
+1 -1

src/global.c
+1 -1

src/win32/mingw-compat.h
+1 -0

No files found.
--- 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) {

--- 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()
 {

--- 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