aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/dbus-c++-threading-mutex.patch
blob: b201700dc06198f225b5a1e7f3ac286450056188 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
Description: Fix FTBFS if DBUS_HAS_RECURSIVE_MUTEX is undefined
Author: Peter Williams <peter@newton.cx>
Last-Update: 2018-01-26

Taken from Debian:
https://sources.debian.org/src/dbus-c++/0.9.0-8.1/debian/patches/07_fix_mutex_ftbfs.patch/

--- dbus-c++-0.9.0.orig/include/dbus-c++/dispatcher.h
+++ dbus-c++-0.9.0/include/dbus-c++/dispatcher.h
@@ -267,6 +267,19 @@ struct Threading
     return new Mx;
   }
 
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+  static bool mutex_free(Mutex *mx)
+  {
+    delete mx;
+    return true;
+  }
+
+  static bool mutex_lock(Mutex *mx)
+  {
+    mx->lock();
+    return true;
+  }
+#else
   static void mutex_free(Mutex *mx)
   {
     delete mx;
@@ -276,6 +289,7 @@ struct Threading
   {
     mx->lock();
   }
+#endif
 
   static void mutex_unlock(Mutex *mx)
   {