[Libreoffice-commits] core.git: sal/osl

Michael Meeks michael.meeks at collabora.com
Sat Jul 12 04:14:02 PDT 2014


 sal/osl/unx/mutex.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 231db56d020d95e9bcf2520cb3c64235d99aa650
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat Jul 12 12:14:58 2014 +0100

    sal: restore pthread to its original non-ideal state.
    
    Hopefully repairs the tinderboxen.
    
    Change-Id: I2933e6cbf1079a09dab48d4f7ed20b93634d8959

diff --git a/sal/osl/unx/mutex.c b/sal/osl/unx/mutex.c
index a43f662..a8eb99d 100644
--- a/sal/osl/unx/mutex.c
+++ b/sal/osl/unx/mutex.c
@@ -25,7 +25,7 @@
 #include <pthread.h>
 #include <stdlib.h>
 
-#if defined LINUX && (__GLIBC__ == 2) && (__GLIBC_MINOR__ <= 1) /* bad hack */
+#if defined LINUX /* bad hack */
 int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int);
 #define pthread_mutexattr_settype pthread_mutexattr_setkind_np
 #define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP


More information about the Libreoffice-commits mailing list