From 6484da92a819bae2dff032d5a6cc36a9e30a9c9c Mon Sep 17 00:00:00 2001 From: Lammert Bies Date: Sun, 11 Dec 2016 19:11:45 +0100 Subject: [PATCH] Moved WIN32 pthread_key_delete to own file --- Makefile | 1 + src/libhttp.c | 7 ------- src/pthread_key_delete.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 src/pthread_key_delete.c diff --git a/Makefile b/Makefile index f668d711..b4b1493b 100644 --- a/Makefile +++ b/Makefile @@ -241,6 +241,7 @@ LIB_SOURCES = src/libhttp.c \ src/pthread_cond_timedwait.c \ src/pthread_cond_wait.c \ src/pthread_key_create.c \ + src/pthread_key_delete.c \ src/pthread_mutex_destroy.c \ src/pthread_mutex_init.c \ src/pthread_mutex_lock.c \ diff --git a/src/libhttp.c b/src/libhttp.c index 98e87150..020f0514 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -113,13 +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_key_delete(pthread_key_t key) { - - return TlsFree(key) ? 0 : 1; - -} /* pthread_key_delete */ - - static int pthread_setspecific(pthread_key_t key, void *value) { return TlsSetValue(key, value) ? 0 : 1; diff --git a/src/pthread_key_delete.c b/src/pthread_key_delete.c new file mode 100644 index 00000000..1470a085 --- /dev/null +++ b/src/pthread_key_delete.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 + +int pthread_key_delete( pthread_key_t key ) { + + return TlsFree(key) ? 0 : 1; + +} /* pthread_key_delete */ + +#endif /* _WIN32 */