Changeset 139

Timestamp:

Oct 28, 2007, 4:59:22 PM (17 years ago)

Author:

rainer

Message:

Detect availability of recursive mutexes on Linux.

Location:

trunk

Files:

• aclocal.m4 (modified) (1 diff)
• include/sh_pthread.h (modified) (1 diff)
• src/sh_mem.c (modified) (1 diff)
• src/sh_pthread.c (modified) (2 diffs)

trunk/aclocal.m4

@@ -1794 +1794 @@
         fi
 
+        # Detect PTHREAD_MUTEX_RECURSIVE
+        AC_MSG_CHECKING([for recursive mutexes])
+        mutex_recursive=no
+        AC_TRY_LINK([
+#define _XOPEN_SOURCE 500
+#include <pthread.h>], [
+pthread_mutexattr_t   mta;
+pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_RECURSIVE);
+return 0;],[mutex_recursive=yes])
+        if test "x$mutex_recursive" = "xyes"
+        then
+          AC_DEFINE(HAVE_PTHREAD_MUTEX_RECURSIVE,1,[Define if you have recursive mutexes.])
+        fi
+        AC_MSG_RESULT($mutex_recursive)
+
         LIBS="$save_LIBS"
         CFLAGS="$save_CFLAGS"

trunk/include/sh_pthread.h

@@ -36 +36 @@
  * ----   Recursive mutex  ----
  */
-#if defined(PTHREAD_MUTEX_RECURSIVE)
+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE)
 
 /* On GNU C, it's an enum, thus the alternative implementation 

trunk/src/sh_mem.c

@@ -19 +19 @@
 
 #include "config_xor.h"
+
+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE)
+#define _XOPEN_SOURCE 500
+#endif
 
 #include <stdio.h>

trunk/src/sh_pthread.c

@@ -15 +15 @@
 }
 
-
+#if !defined(HAVE_PTHREAD_MUTEX_RECURSIVE)
 /**
  * libxml2 threads.c: set of generic threading related routines 
@@ -73 +73 @@
 }
 #endif
+
+
+#endif