libdbus-c++: Refresh patches v2

v2]

refresh via quilt push/refresh rather than devtool

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2018-04-08 08:33:42 -07:00
parent 224549c911
commit a5d4a33915
2 changed files with 19 additions and 24 deletions
@@ -33,10 +33,10 @@ Signed-off-by: André Draszik <adraszik@tycoint.com>
src/pipe.cpp | 2 +- src/pipe.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-) 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/eventloop-integration.cpp b/src/eventloop-integration.cpp Index: libdbus-c++-0.9.0/src/eventloop-integration.cpp
index 5776971..271b503 100644 ===================================================================
--- a/src/eventloop-integration.cpp --- libdbus-c++-0.9.0.orig/src/eventloop-integration.cpp
+++ b/src/eventloop-integration.cpp +++ libdbus-c++-0.9.0/src/eventloop-integration.cpp
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
/* STD */ /* STD */
#include <string.h> #include <string.h>
@@ -44,12 +44,12 @@ index 5776971..271b503 100644
-#include <sys/poll.h> -#include <sys/poll.h>
+#include <poll.h> +#include <poll.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h>
diff --git a/src/eventloop.cpp b/src/eventloop.cpp using namespace DBus;
index f622812..7790e1e 100644 Index: libdbus-c++-0.9.0/src/eventloop.cpp
--- a/src/eventloop.cpp ===================================================================
+++ b/src/eventloop.cpp --- libdbus-c++-0.9.0.orig/src/eventloop.cpp
+++ libdbus-c++-0.9.0/src/eventloop.cpp
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
#include <dbus-c++/eventloop.h> #include <dbus-c++/eventloop.h>
#include <dbus-c++/debug.h> #include <dbus-c++/debug.h>
@@ -59,10 +59,10 @@ index f622812..7790e1e 100644
#include <sys/time.h> #include <sys/time.h>
#include <dbus/dbus.h> #include <dbus/dbus.h>
diff --git a/src/pipe.cpp b/src/pipe.cpp Index: libdbus-c++-0.9.0/src/pipe.cpp
index 01211b3..45c2ba6 100644 ===================================================================
--- a/src/pipe.cpp --- libdbus-c++-0.9.0.orig/src/pipe.cpp
+++ b/src/pipe.cpp +++ libdbus-c++-0.9.0/src/pipe.cpp
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
/* STD */ /* STD */
@@ -72,6 +72,3 @@ index 01211b3..45c2ba6 100644
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <cassert> #include <cassert>
--
2.10.2
@@ -24,17 +24,15 @@ Signed-off-by: Thilo Cestonaro <thilo.cestonaro@ts.fujitsu.com>
include/dbus-c++/eventloop-integration.h | 1 + include/dbus-c++/eventloop-integration.h | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/include/dbus-c++/eventloop-integration.h b/include/dbus-c++/eventloop-integration.h Index: libdbus-c++-0.9.0/include/dbus-c++/eventloop-integration.h
index 5108340..1b56ab5 100644 ===================================================================
--- a/include/dbus-c++/eventloop-integration.h --- libdbus-c++-0.9.0.orig/include/dbus-c++/eventloop-integration.h
+++ b/include/dbus-c++/eventloop-integration.h +++ libdbus-c++-0.9.0/include/dbus-c++/eventloop-integration.h
@@ -27,6 +27,7 @@ @@ -26,6 +26,7 @@
#define __DBUSXX_EVENTLOOP_INTEGRATION_H
#include <cstring>
#include <errno.h> #include <errno.h>
+#include <unistd.h> +#include <unistd.h>
#include "api.h" #include "api.h"
#include "dispatcher.h" #include "dispatcher.h"
#include "util.h" #include "util.h"
--
1.7.9.7