[vlc-devel] commit: Fix forward compatibility with glibc > 2 ( Rémi Denis-Courmont )

git version control git at videolan.org
Mon Aug 3 18:12:47 CEST 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Aug  3 19:09:44 2009 +0300| [4428a70078bb99e670a6a994bce4d21ea412353c] | committer: Rémi Denis-Courmont 

Fix forward compatibility with glibc > 2

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4428a70078bb99e670a6a994bce4d21ea412353c
---

 src/misc/pthread.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/misc/pthread.c b/src/misc/pthread.c
index 08f5ef2..47ac478 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 );




More information about the vlc-devel mailing list