thodg/libgit2

diff --git a/src/common.h b/src/common.h
index 9abd605..51fb918 100644
--- a/src/common.h
+++ b/src/common.h
@@ -45,7 +45,7 @@
 # include "win32/error.h"
 # include "win32/version.h"
 # ifdef GIT_THREADS
-#	include "win32/pthread.h"
+#	include "win32/thread.h"
 # endif
 # if defined(GIT_MSVC_CRTDBG)
 #   include "win32/w32_stack.h"
diff --git a/src/thread-utils.h b/src/thread-utils.h
index f75e440..f016198 100644
--- a/src/thread-utils.h
+++ b/src/thread-utils.h
@@ -41,7 +41,7 @@ typedef git_atomic git_atomic_ssize;
 #ifdef GIT_THREADS
 
 #ifdef GIT_WIN32
-#   include "win32/pthread.h"
+#   include "win32/thread.h"
 #else
 #   include "unix/pthread.h"
 #endif
diff --git a/src/win32/precompiled.h b/src/win32/precompiled.h
index 33ce106..10ca0b8 100644
--- a/src/win32/precompiled.h
+++ b/src/win32/precompiled.h
@@ -16,7 +16,7 @@
 #include <io.h>
 #include <direct.h>
 #ifdef GIT_THREADS
- #include "win32/pthread.h"
+ #include "win32/thread.h"
 #endif
 
 #include "git2.h"
diff --git a/src/win32/pthread.c b/src/win32/pthread.c
deleted file mode 100644
index 80329b2..0000000
--- a/src/win32/pthread.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#include "pthread.h"
-#include "../global.h"
-
-#define CLEAN_THREAD_EXIT 0x6F012842
-
-/* The thread procedure stub used to invoke the caller's procedure
- * and capture the return value for later collection. Windows will
- * only hold a DWORD, but we need to be able to store an entire
- * void pointer. This requires the indirection. */
-static DWORD WINAPI git_win32__threadproc(LPVOID lpParameter)
-{
-	git_thread *thread = lpParameter;
-
-	thread->result = thread->proc(thread->param);
-
-	git__free_tls_data();
-
-	return CLEAN_THREAD_EXIT;
-}
-
-int git_thread_create(
-	git_thread *GIT_RESTRICT thread,
-	void *(*start_routine)(void*),
-	void *GIT_RESTRICT arg)
-{
-	thread->result = NULL;
-	thread->param = arg;
-	thread->proc = start_routine;
-	thread->thread = CreateThread(
-		NULL, 0, git_win32__threadproc, thread, 0, NULL);
-
-	return thread->thread ? 0 : -1;
-}
-
-int git_thread_join(
-	git_thread *thread,
-	void **value_ptr)
-{
-	DWORD exit;
-
-	if (WaitForSingleObject(thread->thread, INFINITE) != WAIT_OBJECT_0)
-		return -1;
-
-	if (!GetExitCodeThread(thread->thread, &exit)) {
-		CloseHandle(thread->thread);
-		return -1;
-	}
-
-	/* Check for the thread having exited uncleanly. If exit was unclean,
-	 * then we don't have a return value to give back to the caller. */
-	if (exit != CLEAN_THREAD_EXIT) {
-		assert(false);
-		thread->result = NULL;
-	}
-
-	if (value_ptr)
-		*value_ptr = thread->result;
-
-	CloseHandle(thread->thread);
-	return 0;
-}
-
-int git_mutex_init(git_mutex *GIT_RESTRICT mutex)
-{
-	InitializeCriticalSection(mutex);
-	return 0;
-}
-
-int git_mutex_free(git_mutex *mutex)
-{
-	DeleteCriticalSection(mutex);
-	return 0;
-}
-
-int git_mutex_lock(git_mutex *mutex)
-{
-	EnterCriticalSection(mutex);
-	return 0;
-}
-
-int git_mutex_unlock(git_mutex *mutex)
-{
-	LeaveCriticalSection(mutex);
-	return 0;
-}
-
-int git_cond_init(git_cond *cond)
-{
-	/* This is an auto-reset event. */
-	*cond = CreateEventW(NULL, FALSE, FALSE, NULL);
-	assert(*cond);
-
-	/* If we can't create the event, claim that the reason was out-of-memory.
-	 * The actual reason can be fetched with GetLastError(). */
-	return *cond ? 0 : ENOMEM;
-}
-
-int git_cond_free(git_cond *cond)
-{
-	BOOL closed;
-
-	if (!cond)
-		return EINVAL;
-
-	closed = CloseHandle(*cond);
-	assert(closed);
-	GIT_UNUSED(closed);
-
-	*cond = NULL;
-	return 0;
-}
-
-int git_cond_wait(git_cond *cond, git_mutex *mutex)
-{
-	int error;
-	DWORD wait_result;
-
-	if (!cond || !mutex)
-		return EINVAL;
-
-	/* The caller must be holding the mutex. */
-	error = git_mutex_unlock(mutex);
-
-	if (error)
-		return error;
-
-	wait_result = WaitForSingleObject(*cond, INFINITE);
-	assert(WAIT_OBJECT_0 == wait_result);
-	GIT_UNUSED(wait_result);
-
-	return git_mutex_lock(mutex);
-}
-
-int git_cond_signal(git_cond *cond)
-{
-	BOOL signaled;
-
-	if (!cond)
-		return EINVAL;
-
-	signaled = SetEvent(*cond);
-	assert(signaled);
-	GIT_UNUSED(signaled);
-
-	return 0;
-}
-
-
-typedef void (WINAPI *win32_srwlock_fn)(GIT_SRWLOCK *);
-
-static win32_srwlock_fn win32_srwlock_initialize;
-static win32_srwlock_fn win32_srwlock_acquire_shared;
-static win32_srwlock_fn win32_srwlock_release_shared;
-static win32_srwlock_fn win32_srwlock_acquire_exclusive;
-static win32_srwlock_fn win32_srwlock_release_exclusive;
-
-int git_rwlock_init(git_rwlock *GIT_RESTRICT lock)
-{
-	if (win32_srwlock_initialize)
-		win32_srwlock_initialize(&lock->native.srwl);
-	else
-		InitializeCriticalSection(&lock->native.csec);
-
-	return 0;
-}
-
-int git_rwlock_rdlock(git_rwlock *lock)
-{
-	if (win32_srwlock_acquire_shared)
-		win32_srwlock_acquire_shared(&lock->native.srwl);
-	else
-		EnterCriticalSection(&lock->native.csec);
-
-	return 0;
-}
-
-int git_rwlock_rdunlock(git_rwlock *lock)
-{
-	if (win32_srwlock_release_shared)
-		win32_srwlock_release_shared(&lock->native.srwl);
-	else
-		LeaveCriticalSection(&lock->native.csec);
-
-	return 0;
-}
-
-int git_rwlock_wrlock(git_rwlock *lock)
-{
-	if (win32_srwlock_acquire_exclusive)
-		win32_srwlock_acquire_exclusive(&lock->native.srwl);
-	else
-		EnterCriticalSection(&lock->native.csec);
-
-	return 0;
-}
-
-int git_rwlock_wrunlock(git_rwlock *lock)
-{
-	if (win32_srwlock_release_exclusive)
-		win32_srwlock_release_exclusive(&lock->native.srwl);
-	else
-		LeaveCriticalSection(&lock->native.csec);
-
-	return 0;
-}
-
-int git_rwlock_free(git_rwlock *lock)
-{
-	if (!win32_srwlock_initialize)
-		DeleteCriticalSection(&lock->native.csec);
-	git__memzero(lock, sizeof(*lock));
-	return 0;
-}
-
-int win32_pthread_initialize(void)
-{
-	HMODULE hModule = GetModuleHandleW(L"kernel32");
-
-	if (hModule) {
-		win32_srwlock_initialize = (win32_srwlock_fn)
-			GetProcAddress(hModule, "InitializeSRWLock");
-		win32_srwlock_acquire_shared = (win32_srwlock_fn)
-			GetProcAddress(hModule, "AcquireSRWLockShared");
-		win32_srwlock_release_shared = (win32_srwlock_fn)
-			GetProcAddress(hModule, "ReleaseSRWLockShared");
-		win32_srwlock_acquire_exclusive = (win32_srwlock_fn)
-			GetProcAddress(hModule, "AcquireSRWLockExclusive");
-		win32_srwlock_release_exclusive = (win32_srwlock_fn)
-			GetProcAddress(hModule, "ReleaseSRWLockExclusive");
-	}
-
-	return 0;
-}
diff --git a/src/win32/pthread.h b/src/win32/pthread.h
deleted file mode 100644
index 977d2df..0000000
--- a/src/win32/pthread.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#ifndef GIT_PTHREAD_H
-#define GIT_PTHREAD_H
-
-#include "../common.h"
-
-#if defined (_MSC_VER)
-#	define GIT_RESTRICT __restrict
-#else
-#	define GIT_RESTRICT __restrict__
-#endif
-
-typedef struct {
-	HANDLE thread;
-	void *(*proc)(void *);
-	void *param;
-	void *result;
-} git_thread;
-
-typedef CRITICAL_SECTION git_mutex;
-typedef HANDLE git_cond;
-
-typedef struct { void *Ptr; } GIT_SRWLOCK;
-
-typedef struct {
-	union {
-		GIT_SRWLOCK srwl;
-		CRITICAL_SECTION csec;
-	} native;
-} git_rwlock;
-
-int git_thread_create(git_thread *GIT_RESTRICT,
-	void *(*) (void *),
-	void *GIT_RESTRICT);
-int git_thread_join(git_thread *, void **);
-
-int git_mutex_init(git_mutex *GIT_RESTRICT mutex);
-int git_mutex_free(git_mutex *);
-int git_mutex_lock(git_mutex *);
-int git_mutex_unlock(git_mutex *);
-
-int git_cond_init(git_cond *);
-int git_cond_free(git_cond *);
-int git_cond_wait(git_cond *, git_mutex *);
-int git_cond_signal(git_cond *);
-
-int git_rwlock_init(git_rwlock *GIT_RESTRICT lock);
-int git_rwlock_rdlock(git_rwlock *);
-int git_rwlock_rdunlock(git_rwlock *);
-int git_rwlock_wrlock(git_rwlock *);
-int git_rwlock_wrunlock(git_rwlock *);
-int git_rwlock_free(git_rwlock *);
-
-extern int win32_pthread_initialize(void);
-
-#endif
diff --git a/src/win32/thread.c b/src/win32/thread.c
new file mode 100644
index 0000000..8222c65
--- /dev/null
+++ b/src/win32/thread.c
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "thread.h"
+#include "../global.h"
+
+#define CLEAN_THREAD_EXIT 0x6F012842
+
+/* The thread procedure stub used to invoke the caller's procedure
+ * and capture the return value for later collection. Windows will
+ * only hold a DWORD, but we need to be able to store an entire
+ * void pointer. This requires the indirection. */
+static DWORD WINAPI git_win32__threadproc(LPVOID lpParameter)
+{
+	git_thread *thread = lpParameter;
+
+	thread->result = thread->proc(thread->param);
+
+	git__free_tls_data();
+
+	return CLEAN_THREAD_EXIT;
+}
+
+int git_thread_create(
+	git_thread *GIT_RESTRICT thread,
+	void *(*start_routine)(void*),
+	void *GIT_RESTRICT arg)
+{
+	thread->result = NULL;
+	thread->param = arg;
+	thread->proc = start_routine;
+	thread->thread = CreateThread(
+		NULL, 0, git_win32__threadproc, thread, 0, NULL);
+
+	return thread->thread ? 0 : -1;
+}
+
+int git_thread_join(
+	git_thread *thread,
+	void **value_ptr)
+{
+	DWORD exit;
+
+	if (WaitForSingleObject(thread->thread, INFINITE) != WAIT_OBJECT_0)
+		return -1;
+
+	if (!GetExitCodeThread(thread->thread, &exit)) {
+		CloseHandle(thread->thread);
+		return -1;
+	}
+
+	/* Check for the thread having exited uncleanly. If exit was unclean,
+	 * then we don't have a return value to give back to the caller. */
+	if (exit != CLEAN_THREAD_EXIT) {
+		assert(false);
+		thread->result = NULL;
+	}
+
+	if (value_ptr)
+		*value_ptr = thread->result;
+
+	CloseHandle(thread->thread);
+	return 0;
+}
+
+int git_mutex_init(git_mutex *GIT_RESTRICT mutex)
+{
+	InitializeCriticalSection(mutex);
+	return 0;
+}
+
+int git_mutex_free(git_mutex *mutex)
+{
+	DeleteCriticalSection(mutex);
+	return 0;
+}
+
+int git_mutex_lock(git_mutex *mutex)
+{
+	EnterCriticalSection(mutex);
+	return 0;
+}
+
+int git_mutex_unlock(git_mutex *mutex)
+{
+	LeaveCriticalSection(mutex);
+	return 0;
+}
+
+int git_cond_init(git_cond *cond)
+{
+	/* This is an auto-reset event. */
+	*cond = CreateEventW(NULL, FALSE, FALSE, NULL);
+	assert(*cond);
+
+	/* If we can't create the event, claim that the reason was out-of-memory.
+	 * The actual reason can be fetched with GetLastError(). */
+	return *cond ? 0 : ENOMEM;
+}
+
+int git_cond_free(git_cond *cond)
+{
+	BOOL closed;
+
+	if (!cond)
+		return EINVAL;
+
+	closed = CloseHandle(*cond);
+	assert(closed);
+	GIT_UNUSED(closed);
+
+	*cond = NULL;
+	return 0;
+}
+
+int git_cond_wait(git_cond *cond, git_mutex *mutex)
+{
+	int error;
+	DWORD wait_result;
+
+	if (!cond || !mutex)
+		return EINVAL;
+
+	/* The caller must be holding the mutex. */
+	error = git_mutex_unlock(mutex);
+
+	if (error)
+		return error;
+
+	wait_result = WaitForSingleObject(*cond, INFINITE);
+	assert(WAIT_OBJECT_0 == wait_result);
+	GIT_UNUSED(wait_result);
+
+	return git_mutex_lock(mutex);
+}
+
+int git_cond_signal(git_cond *cond)
+{
+	BOOL signaled;
+
+	if (!cond)
+		return EINVAL;
+
+	signaled = SetEvent(*cond);
+	assert(signaled);
+	GIT_UNUSED(signaled);
+
+	return 0;
+}
+
+
+typedef void (WINAPI *win32_srwlock_fn)(GIT_SRWLOCK *);
+
+static win32_srwlock_fn win32_srwlock_initialize;
+static win32_srwlock_fn win32_srwlock_acquire_shared;
+static win32_srwlock_fn win32_srwlock_release_shared;
+static win32_srwlock_fn win32_srwlock_acquire_exclusive;
+static win32_srwlock_fn win32_srwlock_release_exclusive;
+
+int git_rwlock_init(git_rwlock *GIT_RESTRICT lock)
+{
+	if (win32_srwlock_initialize)
+		win32_srwlock_initialize(&lock->native.srwl);
+	else
+		InitializeCriticalSection(&lock->native.csec);
+
+	return 0;
+}
+
+int git_rwlock_rdlock(git_rwlock *lock)
+{
+	if (win32_srwlock_acquire_shared)
+		win32_srwlock_acquire_shared(&lock->native.srwl);
+	else
+		EnterCriticalSection(&lock->native.csec);
+
+	return 0;
+}
+
+int git_rwlock_rdunlock(git_rwlock *lock)
+{
+	if (win32_srwlock_release_shared)
+		win32_srwlock_release_shared(&lock->native.srwl);
+	else
+		LeaveCriticalSection(&lock->native.csec);
+
+	return 0;
+}
+
+int git_rwlock_wrlock(git_rwlock *lock)
+{
+	if (win32_srwlock_acquire_exclusive)
+		win32_srwlock_acquire_exclusive(&lock->native.srwl);
+	else
+		EnterCriticalSection(&lock->native.csec);
+
+	return 0;
+}
+
+int git_rwlock_wrunlock(git_rwlock *lock)
+{
+	if (win32_srwlock_release_exclusive)
+		win32_srwlock_release_exclusive(&lock->native.srwl);
+	else
+		LeaveCriticalSection(&lock->native.csec);
+
+	return 0;
+}
+
+int git_rwlock_free(git_rwlock *lock)
+{
+	if (!win32_srwlock_initialize)
+		DeleteCriticalSection(&lock->native.csec);
+	git__memzero(lock, sizeof(*lock));
+	return 0;
+}
+
+int win32_pthread_initialize(void)
+{
+	HMODULE hModule = GetModuleHandleW(L"kernel32");
+
+	if (hModule) {
+		win32_srwlock_initialize = (win32_srwlock_fn)
+			GetProcAddress(hModule, "InitializeSRWLock");
+		win32_srwlock_acquire_shared = (win32_srwlock_fn)
+			GetProcAddress(hModule, "AcquireSRWLockShared");
+		win32_srwlock_release_shared = (win32_srwlock_fn)
+			GetProcAddress(hModule, "ReleaseSRWLockShared");
+		win32_srwlock_acquire_exclusive = (win32_srwlock_fn)
+			GetProcAddress(hModule, "AcquireSRWLockExclusive");
+		win32_srwlock_release_exclusive = (win32_srwlock_fn)
+			GetProcAddress(hModule, "ReleaseSRWLockExclusive");
+	}
+
+	return 0;
+}
diff --git a/src/win32/thread.h b/src/win32/thread.h
new file mode 100644
index 0000000..f5dd41b
--- /dev/null
+++ b/src/win32/thread.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#ifndef INCLUDE_win32_thread_h__
+#define INCLUDE_win32_thread_h__
+
+#include "../common.h"
+
+#if defined (_MSC_VER)
+#	define GIT_RESTRICT __restrict
+#else
+#	define GIT_RESTRICT __restrict__
+#endif
+
+typedef struct {
+	HANDLE thread;
+	void *(*proc)(void *);
+	void *param;
+	void *result;
+} git_thread;
+
+typedef CRITICAL_SECTION git_mutex;
+typedef HANDLE git_cond;
+
+typedef struct { void *Ptr; } GIT_SRWLOCK;
+
+typedef struct {
+	union {
+		GIT_SRWLOCK srwl;
+		CRITICAL_SECTION csec;
+	} native;
+} git_rwlock;
+
+int git_thread_create(git_thread *GIT_RESTRICT,
+	void *(*) (void *),
+	void *GIT_RESTRICT);
+int git_thread_join(git_thread *, void **);
+
+int git_mutex_init(git_mutex *GIT_RESTRICT mutex);
+int git_mutex_free(git_mutex *);
+int git_mutex_lock(git_mutex *);
+int git_mutex_unlock(git_mutex *);
+
+int git_cond_init(git_cond *);
+int git_cond_free(git_cond *);
+int git_cond_wait(git_cond *, git_mutex *);
+int git_cond_signal(git_cond *);
+
+int git_rwlock_init(git_rwlock *GIT_RESTRICT lock);
+int git_rwlock_rdlock(git_rwlock *);
+int git_rwlock_rdunlock(git_rwlock *);
+int git_rwlock_wrlock(git_rwlock *);
+int git_rwlock_wrunlock(git_rwlock *);
+int git_rwlock_free(git_rwlock *);
+
+extern int win32_pthread_initialize(void);
+
+#endif /* INCLUDE_win32_thread_h__ */