summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-07-11 12:49:48 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-07-11 14:07:39 +0100
commitf000001329c1d008d8db22cc3369d331dbf5cf4e (patch)
tree4c91983ba46e63dcbe148c2456b287b4e294c95f
parent0f02bf650814ab46630ea1f9f995b94f37bc5c30 (diff)
downloaddbus-c++-baserock/genivi-demo-platform.tar.gz
Fix build with DBUS_HAS_RECURSIVE_MUTEXbaserock/genivi-demo-platform
-rw-r--r--include/dbus-c++/dispatcher.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/include/dbus-c++/dispatcher.h b/include/dbus-c++/dispatcher.h
index b5b5536..9c9a96d 100644
--- a/include/dbus-c++/dispatcher.h
+++ b/include/dbus-c++/dispatcher.h
@@ -227,15 +227,9 @@ protected:
};
typedef Mutex *(*MutexNewFn)();
-typedef void (*MutexUnlockFn)(Mutex *mx);
-
-#ifndef DBUS_HAS_RECURSIVE_MUTEX
-typedef bool (*MutexFreeFn)(Mutex *mx);
-typedef bool (*MutexLockFn)(Mutex *mx);
-#else
typedef void (*MutexFreeFn)(Mutex *mx);
typedef void (*MutexLockFn)(Mutex *mx);
-#endif//DBUS_HAS_RECURSIVE_MUTEX
+typedef void (*MutexUnlockFn)(Mutex *mx);
typedef CondVar *(*CondVarNewFn)();
typedef void (*CondVarFreeFn)(CondVar *cv);