From: Roman Puls <puls@x-fabric.com>
Date: Wed, 2 Dec 2009 06:15:15 +0000 (-0500)
Subject: Fix up evthread compilation on windows
X-Git-Tag: release-2.0.4-alpha~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd6f1babf7c93c1a4b32ad9bbb0022d203398ac3;p=libevent

Fix up evthread compilation on windows
---

diff --git a/evthread_win32.c b/evthread_win32.c
index 05ed9217..ad055107 100644
--- a/evthread_win32.c
+++ b/evthread_win32.c
@@ -55,7 +55,7 @@ evthread_win32_lock_free(void *_lock, unsigned locktype)
 	DeleteCriticalSection(lock);
 }
 
-static void
+static int
 evthread_win32_lock(unsigned mode, void *_lock)
 {
 	CRITICAL_SECTION *lock = _lock;
@@ -67,11 +67,12 @@ evthread_win32_lock(unsigned mode, void *_lock)
 	}
 }
 
-static void
+static int
 evthread_win32_unlock(unsigned mode, void *_lock)
 {
 	CRITICAL_SECTION *lock = _lock;
-	LeaveCriticalSection(lock)
+	LeaveCriticalSection(lock);
+	return 0;
 }
 
 static unsigned long
@@ -86,7 +87,7 @@ evthread_use_windows_threads(void)
 	struct evthread_lock_callbacks cbs = {
 		EVTHREAD_LOCK_API_VERSION,
 		EVTHREAD_LOCKTYPE_RECURSIVE,
-		evthread_win32_lock_alloc,
+		evthread_win32_lock_create,
 		evthread_win32_lock_free,
 		evthread_win32_lock,
 		evthread_win32_unlock
diff --git a/include/event2/thread.h b/include/event2/thread.h
index f9deca82..0540b7f9 100644
--- a/include/event2/thread.h
+++ b/include/event2/thread.h
@@ -170,11 +170,11 @@ int evthread_use_windows_threads(void);
 int evthread_use_pthreads(void);
 #define EVTHREAD_USE_PTHREADS_IMPLEMENTED 1
 
+#endif
+
 /* XXXXX */
 void evthread_enable_lock_debuging(void);
 
-#endif
-
 #endif /* _EVENT_DISABLE_THREAD_SUPPORT */
 
 struct event_base;