From 1e3668733eccc7d035e697ea94043fae85e9231a Mon Sep 17 00:00:00 2001
From: Lammert Bies <github@linocomm.net>
Date: Sun, 11 Dec 2016 13:17:09 +0100
Subject: [PATCH] Moved join_thread to own file

---
 Makefile                  |  1 +
 src/httplib_join_thread.c | 65 +++++++++++++++++++++++++++++++++++++++
 src/libhttp.c             | 31 -------------------
 3 files changed, 66 insertions(+), 31 deletions(-)
 create mode 100644 src/httplib_join_thread.c

diff --git a/Makefile b/Makefile
index b74f2e57..398e117f 100644
--- a/Makefile
+++ b/Makefile
@@ -100,6 +100,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/httplib_is_valid_http_method.c			\
 		src/httplib_is_valid_port.c				\
 		src/httplib_is_websocket_protocol.c			\
+		src/httplib_join_thread.c				\
 		src/httplib_load_dll.c					\
 		src/httplib_lock_unlock_connection.c			\
 		src/httplib_lock_unlock_context.c			\
diff --git a/src/httplib_join_thread.c b/src/httplib_join_thread.c
new file mode 100644
index 00000000..e5e4b7a4
--- /dev/null
+++ b/src/httplib_join_thread.c
@@ -0,0 +1,65 @@
+/* 
+ * 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)
+
+/* Wait for a thread to finish. */
+int XX_httplib_join_thread( pthread_t threadid ) {
+
+	int result;
+	DWORD dwevent;
+
+	result = -1;
+	dwevent = WaitForSingleObject(threadid, INFINITE);
+	if (dwevent == WAIT_FAILED) {
+	} else {
+		if (dwevent == WAIT_OBJECT_0) {
+			CloseHandle(threadid);
+			result = 0;
+		}
+	}
+
+	return result;
+
+}  /* XX_httplib_join_thread */
+
+#else
+
+
+/* Wait for a thread to finish. */
+int XX_httplib_join_thread( pthread_t threadid ) {
+
+	int result;
+
+	result = pthread_join(threadid, NULL);
+	return result;
+
+}  /* XX_httplib_join_thread */
+
+#endif /* _WIN32 */
diff --git a/src/libhttp.c b/src/libhttp.c
index 01a63b17..6cf07723 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -2201,26 +2201,6 @@ int XX_httplib_start_thread_with_id( unsigned(__stdcall *f)(void *), void *p, pt
 }  /* XX_httplib_start_thread_with_id */
 
 
-/* Wait for a thread to finish. */
-int XX_httplib_join_thread( pthread_t threadid ) {
-
-	int result;
-	DWORD dwevent;
-
-	result = -1;
-	dwevent = WaitForSingleObject(threadid, INFINITE);
-	if (dwevent == WAIT_FAILED) {
-	} else {
-		if (dwevent == WAIT_OBJECT_0) {
-			CloseHandle(threadid);
-			result = 0;
-		}
-	}
-
-	return result;
-
-}  /* XX_httplib_join_thread */
-
 #else
 
 int XX_httplib_stat( struct mg_connection *conn, const char *path, struct file *filep ) {
@@ -2297,15 +2277,4 @@ int XX_httplib_start_thread_with_id( mg_thread_func_t func, void *param, pthread
 
 }  /* XX_httplib_start_thread_with_id */
 
-
-/* Wait for a thread to finish. */
-int XX_httplib_join_thread( pthread_t threadid ) {
-
-	int result;
-
-	result = pthread_join(threadid, NULL);
-	return result;
-
-}  /* XX_httplib_join_thread */
-
 #endif /* _WIN32 */