Attachment #478144 for bug #622790

View | Details | Raw Unified | Return to bug 622790
Collapse All | Expand All




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 CondVar *(*CondVarNewFn)();
typedef void (*CondVarFreeFn)(CondVar *cv);

Lines 83-87 Link Here

(-)./src/pipe.cpp.old (-1 / +1 lines)
83	void Pipe::signal()	83	void Pipe::signal()
84	{	84	{
85	// TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work...	85	// TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work...
86	::write(_fd_write, '\0', 1);	86	::write(_fd_write, "\0", 1);
87	}	87	}

Return to bug 622790

Lines 229-241 Link Here

(-)./include/dbus-c++/dispatcher.h.old (-5 lines)
229	typedef Mutex (MutexNewFn)();	229	typedef Mutex (MutexNewFn)();
230	typedef void (MutexUnlockFn)(Mutex mx);	230	typedef void (MutexUnlockFn)(Mutex mx);
231		231
232	#ifndef DBUS_HAS_RECURSIVE_MUTEX
233	typedef bool (MutexFreeFn)(Mutex mx);
234	typedef bool (MutexLockFn)(Mutex mx);
235	#else
236	typedef void (MutexFreeFn)(Mutex mx);	232	typedef void (MutexFreeFn)(Mutex mx);
237	typedef void (MutexLockFn)(Mutex mx);	233	typedef void (MutexLockFn)(Mutex mx);
238	#endif//DBUS_HAS_RECURSIVE_MUTEX
239		234
240	typedef CondVar (CondVarNewFn)();	235	typedef CondVar (CondVarNewFn)();
241	typedef void (CondVarFreeFn)(CondVar cv);	236	typedef void (CondVarFreeFn)(CondVar cv);