mirror of
https://github.com/lammertb/libhttp.git
synced 2026-01-27 08:02:47 +03:00
Moved WIN32 pthread_mutex_lock to own file
This commit is contained in:
1
Makefile
1
Makefile
@@ -236,6 +236,7 @@ LIB_SOURCES = src/libhttp.c \
|
||||
src/md5.c \
|
||||
src/pthread_mutex_destroy.c \
|
||||
src/pthread_mutex_init.c \
|
||||
src/pthread_mutex_lock.c \
|
||||
src/sha1.c
|
||||
LIB_INLINE = src/mod_lua.inl src/md5.inl
|
||||
APP_SOURCES = src/main.c
|
||||
|
||||
@@ -829,13 +829,6 @@ void XX_httplib_set_thread_name(const char *threadName) {
|
||||
|
||||
#if defined(_WIN32)
|
||||
|
||||
int pthread_mutex_lock( pthread_mutex_t *mutex ) {
|
||||
|
||||
return (WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0) ? 0 : -1;
|
||||
|
||||
} /* pthread_mutex_lock */
|
||||
|
||||
|
||||
int pthread_mutex_trylock( pthread_mutex_t *mutex ) {
|
||||
|
||||
switch ( WaitForSingleObject( *mutex, 0 ) ) {
|
||||
|
||||
38
src/pthread_mutex_lock.c
Normal file
38
src/pthread_mutex_lock.c
Normal file
@@ -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_lock( pthread_mutex_t *mutex ) {
|
||||
|
||||
return (WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0) ? 0 : -1;
|
||||
|
||||
} /* pthread_mutex_lock */
|
||||
|
||||
#endif /* _WIN32 */
|
||||
Reference in New Issue
Block a user