From fb15530709e3718ba33840e49c751cb5af33c1ea Mon Sep 17 00:00:00 2001
From: Lammert Bies <github@linocomm.net>
Date: Sun, 11 Dec 2016 19:05:51 +0100
Subject: [PATCH] Moved WIN32 pthread_self to own file

---
 Makefile           |  1 +
 src/libhttp.c      |  7 +------
 src/pthread_self.c | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 src/pthread_self.c

diff --git a/Makefile b/Makefile
index ec6fad86..69f52736 100644
--- a/Makefile
+++ b/Makefile
@@ -245,6 +245,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/pthread_mutex_lock.c				\
 		src/pthread_mutex_trylock.c				\
 		src/pthread_mutex_unlock.c				\
+		src/pthread_self.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 154dbd51..8f97f7e3 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -112,13 +112,8 @@ mg_static_assert(sizeof(size_t) == 4 || sizeof(size_t) == 8, "size_t data type s
 
 static CRITICAL_SECTION global_log_file_lock;
 
-static DWORD pthread_self(void) {
 
-	return GetCurrentThreadId();
-}
-
-
-static int pthread_key_create( pthread_key_t *key, void (*_ignored)(void *)) {
+static int pthread_key_create( pthread_key_t *key, void (*_ignored)(void *) ) {
 
 	(void)_ignored;
 
diff --git a/src/pthread_self.c b/src/pthread_self.c
new file mode 100644
index 00000000..539e284a
--- /dev/null
+++ b/src/pthread_self.c
@@ -0,0 +1,38 @@
+/* 
+ * 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"
+
+
+#ifdef _WIN32
+
+DWORD pthread_self( void ) {
+
+	return GetCurrentThreadId();
+
+}  /* pthread_self */
+
+#endif  /* _WIN32 */