From: Rémi Denis-Courmont Date: Mon, 3 Aug 2009 16:09:44 +0000 (+0300) Subject: Fix forward compatibility with glibc > 2 X-Git-Tag: 1.1.0-ff~4594 X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=4428a70078bb99e670a6a994bce4d21ea412353c;hp=53c895bcfb948449640a579e8059dc0eeaa16b26 Fix forward compatibility with glibc > 2 --- diff --git a/src/misc/pthread.c b/src/misc/pthread.c index 08f5ef23d7..47ac47831d 100644 --- a/src/misc/pthread.c +++ b/src/misc/pthread.c @@ -145,7 +145,7 @@ void vlc_mutex_init( vlc_mutex_t *p_mutex ) pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_NORMAL ); #else /* Create error-checking mutex to detect problems more easily. */ -# if defined (__GLIBC__) && (__GLIBC_MINOR__ < 6) +# if defined (__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ < 6) pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_ERRORCHECK_NP ); # else pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_ERRORCHECK ); @@ -164,7 +164,7 @@ void vlc_mutex_init_recursive( vlc_mutex_t *p_mutex ) pthread_mutexattr_t attr; pthread_mutexattr_init( &attr ); -#if defined (__GLIBC__) && (__GLIBC_MINOR__ < 6) +#if defined (__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ < 6) pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_RECURSIVE_NP ); #else pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE );