From 56ce0b86ca91ee19df5598c97aaabb70f366756a Mon Sep 17 00:00:00 2001 From: Lammert Bies Date: Sun, 11 Dec 2016 18:36:25 +0100 Subject: [PATCH] Moved WIN32 pthread_mutex_destroy to own file --- Makefile | 1 + src/libhttp.c | 7 ------- src/pthread_mutex_destroy.c | 38 +++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 src/pthread_mutex_destroy.c diff --git a/Makefile b/Makefile index 8650e7ab..25f29a54 100644 --- a/Makefile +++ b/Makefile @@ -234,6 +234,7 @@ LIB_SOURCES = src/libhttp.c \ src/httplib_worker_thread.c \ src/httplib_write.c \ src/md5.c \ + src/pthread_mutex_destroy.c \ src/pthread_mutex_init.c \ src/sha1.c LIB_INLINE = src/mod_lua.inl src/md5.inl diff --git a/src/libhttp.c b/src/libhttp.c index caf747c8..1f280585 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -829,13 +829,6 @@ void XX_httplib_set_thread_name(const char *threadName) { #if defined(_WIN32) -int pthread_mutex_destroy( pthread_mutex_t *mutex ) { - - return ( CloseHandle(*mutex) == 0 ) ? -1 : 0; - -} /* pthread_mutex_destroy */ - - int pthread_mutex_lock( pthread_mutex_t *mutex ) { return (WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0) ? 0 : -1; diff --git a/src/pthread_mutex_destroy.c b/src/pthread_mutex_destroy.c new file mode 100644 index 00000000..e1447367 --- /dev/null +++ b/src/pthread_mutex_destroy.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" + + +#if defined(_WIN32) + +int pthread_mutex_destroy( pthread_mutex_t *mutex ) { + + return ( CloseHandle(*mutex) == 0 ) ? -1 : 0; + +} /* pthread_mutex_destroy */ + +#endif /* _WIN32 */