1
0
mirror of https://github.com/lammertb/libhttp.git synced 2026-01-27 08:02:47 +03:00

Moved WIN32 pthread_setspecific to own file

This commit is contained in:
Lammert Bies
2016-12-11 19:15:25 +01:00
parent 6484da92a8
commit 7e46ee2647
3 changed files with 40 additions and 10 deletions

View File

@@ -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

View File

@@ -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 */

39
src/pthread_setspecific.c Normal file
View File

@@ -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 */