Merge branch 'rs/zip-tests' into maint

diff --git a/thread-utils.c b/thread-utils.c
index 55e7e2904eb5f95cedaec2520ddd1d158ee93c7a..7f4b76a95899cc28aa1d42598d1649f126980ed9 100644 (file)
--- a/thread-utils.c
+++ b/thread-utils.c
@@ -1,9 +1,7 @@
 #include "cache.h"
+#include "thread-utils.h"
 
-#ifdef _WIN32
-#  define WIN32_LEAN_AND_MEAN
-#  include <windows.h>
-#elif defined(hpux) || defined(__hpux) || defined(_hpux)
+#if defined(hpux) || defined(__hpux) || defined(_hpux)
 #  include <sys/pstat.h>
 #endif
 
@@ -46,3 +44,18 @@ int online_cpus(void)
 
        return 1;
 }
+
+int init_recursive_mutex(pthread_mutex_t *m)
+{
+       pthread_mutexattr_t a;
+       int ret;
+
+       ret = pthread_mutexattr_init(&a);
+       if (!ret) {
+               ret = pthread_mutexattr_settype(&a, PTHREAD_MUTEX_RECURSIVE);
+               if (!ret)
+                       ret = pthread_mutex_init(m, &a);
+               pthread_mutexattr_destroy(&a);
+       }
+       return ret;
+}