From 7e46ee26477e4994efc87ca01dfaf6be7ee856ab Mon Sep 17 00:00:00 2001
From: Lammert Bies <github@linocomm.net>
Date: Sun, 11 Dec 2016 19:15:25 +0100
Subject: [PATCH] Moved WIN32 pthread_setspecific to own file

---
 Makefile                  |  1 +
 src/libhttp.c             | 10 ----------
 src/pthread_setspecific.c | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 src/pthread_setspecific.c

diff --git a/Makefile b/Makefile
index b4b1493b..ed557cd4 100644
--- a/Makefile
+++ b/Makefile
@@ -248,6 +248,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/pthread_mutex_trylock.c				\
 		src/pthread_mutex_unlock.c				\
 		src/pthread_self.c					\
+		src/pthread_setspecific.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 020f0514..92b84336 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -113,12 +113,6 @@ mg_static_assert(sizeof(size_t) == 4 || sizeof(size_t) == 8, "size_t data type s
 static CRITICAL_SECTION global_log_file_lock;
 
 
-static int pthread_setspecific(pthread_key_t key, void *value) {
-
-	return TlsSetValue(key, value) ? 0 : 1;
-
-}  /* pthread_setspecific */
-
 
 static void * pthread_getspecific(pthread_key_t key) {
 
@@ -126,10 +120,6 @@ static void * pthread_getspecific(pthread_key_t key) {
 
 }  /* pthread_getspecific */
 
-#if defined(__MINGW32__)
-/* Enable unused function warning again */
-#pragma GCC diagnostic pop
-#endif  /* __MINGW32__ */
 
 struct pthread_mutex_undefined_struct *XX_httplib_pthread_mutex_attr = NULL;
 #else  /* _WIN32 */
diff --git a/src/pthread_setspecific.c b/src/pthread_setspecific.c
new file mode 100644
index 00000000..7a5355f3
--- /dev/null
+++ b/src/pthread_setspecific.c
@@ -0,0 +1,39 @@
+/* 
+ * 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)
+
+static int pthread_setspecific(pthread_key_t key, void *value) {
+
+	return TlsSetValue(key, value) ? 0 : 1;
+
+}  /* pthread_setspecific */
+
+#endif  /* _WIN32 */