forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-libs/dbus-c++: add gcc7 fix, bug #622790 by Hector Martin
Package-Manager: Portage-2.3.6, Repoman-2.3.2
- Loading branch information
Showing
2 changed files
with
27 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
--- ./include/dbus-c++/dispatcher.h.old 2017-06-27 07:03:52.159413535 +0900 | ||
+++ ./include/dbus-c++/dispatcher.h 2017-06-27 07:04:04.974399195 +0900 | ||
@@ -229,13 +229,8 @@ | ||
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); | ||
--- ./src/pipe.cpp.old 2017-06-27 07:00:17.275653653 +0900 | ||
+++ ./src/pipe.cpp 2017-06-27 07:00:23.537646665 +0900 | ||
@@ -83,5 +83,5 @@ | ||
void Pipe::signal() | ||
{ | ||
// TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work... | ||
- ::write(_fd_write, '\0', 1); | ||
+ ::write(_fd_write, "\0", 1); | ||
} |