From b081e7b81e62a45db8b2307781a6f18b1bbff800 Mon Sep 17 00:00:00 2001 From: Felix Janda Date: Mon, 2 Feb 2015 20:08:40 +0100 Subject: [PATCH] Use PTHREAD_MUTEX_RECURSIVE unconditionally Previously the nonportable PTHREAD_MUTEX_RECURSIVE_NP had been used for portability with glibc. However since 1998 glibc also has PTHREAD_MUTEX_RECURSIVE if _XOPEN_SOURCE is >= 500. So we can use the portable version for all known systems. --- libgamin/gam_data.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libgamin/gam_data.c b/libgamin/gam_data.c index c0ea893..4d6a0c8 100644 --- a/libgamin/gam_data.c +++ b/libgamin/gam_data.c @@ -2,6 +2,7 @@ * gam_data.c: implementation of the connection data handling of libgamin */ +#define _XOPEN_SOURCE 700 #include #include /* for memset */ #include @@ -470,11 +471,7 @@ gamin_data_new(void) } if (is_threaded > 0) { pthread_mutexattr_init(&attr); -#if defined(linux) || defined(PTHREAD_MUTEX_RECURSIVE_NP) - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); -#else pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); -#endif pthread_mutex_init(&ret->lock, &attr); pthread_mutexattr_destroy(&attr); } -- 2.0.5