From a0a89e5b311d24bdaba85012e8f6356da53cbc2b Mon Sep 17 00:00:00 2001
From: Lammert Bies <github@linocomm.net>
Date: Sun, 11 Dec 2016 18:42:30 +0100
Subject: [PATCH] Moved WIN32 pthread_mutex_trylock to own file

---
 Makefile                    |  1 +
 src/libhttp.c               | 14 +-----------
 src/pthread_mutex_trylock.c | 43 +++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 13 deletions(-)
 create mode 100644 src/pthread_mutex_trylock.c

diff --git a/Makefile b/Makefile
index 3624dc49..0600cc43 100644
--- a/Makefile
+++ b/Makefile
@@ -237,6 +237,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/pthread_mutex_destroy.c				\
 		src/pthread_mutex_init.c				\
 		src/pthread_mutex_lock.c				\
+		src/pthread_mutex_trylock.c				\
 		src/sha1.c
 LIB_INLINE  = src/mod_lua.inl src/md5.inl
 APP_SOURCES = src/main.c
diff --git a/src/libhttp.c b/src/libhttp.c
index e296c289..000beed7 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -829,19 +829,7 @@ void XX_httplib_set_thread_name(const char *threadName) {
 
 #if defined(_WIN32)
 
-int pthread_mutex_trylock( pthread_mutex_t *mutex ) {
-
-	switch ( WaitForSingleObject( *mutex, 0 ) ) {
-
-		case WAIT_OBJECT_0: return 0;
-		case WAIT_TIMEOUT: return -2; /* EBUSY */
-	}
-	return -1;
-
-}  /* pthread_mutex_trylock */
-
-
-static int pthread_mutex_unlock( pthread_mutex_t *mutex ) {
+int pthread_mutex_unlock( pthread_mutex_t *mutex ) {
 
 	return ( ReleaseMutex( *mutex ) == 0 ) ? -1 : 0;
 
diff --git a/src/pthread_mutex_trylock.c b/src/pthread_mutex_trylock.c
new file mode 100644
index 00000000..99ed5e85
--- /dev/null
+++ b/src/pthread_mutex_trylock.c
@@ -0,0 +1,43 @@
+/* 
+ * Copyright (c) 2016 Lammert Bies
+ * Copyright (c) 2013-2016 the Civetweb developers
+ * Copyright (c) 2004-2013 Sergey Lyubka
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+
+#include "libhttp-private.h"
+
+
+#if defined(_WIN32)
+
+int pthread_mutex_trylock( pthread_mutex_t *mutex ) {
+
+	switch ( WaitForSingleObject( *mutex, 0 ) ) {
+
+		case WAIT_OBJECT_0: return 0;
+		case WAIT_TIMEOUT: return -2; /* EBUSY */
+	}
+	return -1;
+
+}  /* pthread_mutex_trylock */
+
+#endif /* _WIN32 */