From 8cd92afd562c14255c962eb5d29d96a46004f9ee Mon Sep 17 00:00:00 2001 From: Lammert Bies Date: Sun, 11 Dec 2016 19:18:02 +0100 Subject: [PATCH] Moved WIN32 pthread_getspecific to own file --- Makefile | 1 + src/libhttp.c | 7 ------- src/pthread_getspecific.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 src/pthread_getspecific.c diff --git a/Makefile b/Makefile index ed557cd4..d4c0a013 100644 --- a/Makefile +++ b/Makefile @@ -240,6 +240,7 @@ LIB_SOURCES = src/libhttp.c \ src/pthread_cond_signal.c \ src/pthread_cond_timedwait.c \ src/pthread_cond_wait.c \ + src/pthread_getspecific.c \ src/pthread_key_create.c \ src/pthread_key_delete.c \ src/pthread_mutex_destroy.c \ diff --git a/src/libhttp.c b/src/libhttp.c index 92b84336..90b7a0be 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -114,13 +114,6 @@ static CRITICAL_SECTION global_log_file_lock; -static void * pthread_getspecific(pthread_key_t key) { - - return TlsGetValue(key); - -} /* pthread_getspecific */ - - struct pthread_mutex_undefined_struct *XX_httplib_pthread_mutex_attr = NULL; #else /* _WIN32 */ pthread_mutexattr_t XX_httplib_pthread_mutex_attr; diff --git a/src/pthread_getspecific.c b/src/pthread_getspecific.c new file mode 100644 index 00000000..928feead --- /dev/null +++ b/src/pthread_getspecific.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) + +void * pthread_getspecific(pthread_key_t key) { + + return TlsGetValue(key); + +} /* pthread_getspecific */ + +#endif /* _WIN32 */