summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas <andreas.volz@tux-style.com>2021-07-28 22:08:52 +0200
committerGitHub <noreply@github.com>2021-07-28 22:08:52 +0200
commitf6593f35b9169af85534931e2e7136613db7609d (patch)
treeefb68dd665a4ba0d6e6f4b61926bb3a77d00ef7d
parente3455d20fc0b6e00bce7668fbd9b165fdc8a7040 (diff)
parente12ad7890cbed2d38a14f9b8960f91d187e103f0 (diff)
downloaddbus-c++-f6593f35b9169af85534931e2e7136613db7609d.tar.gz
Merge branch 'pkgw:master' into masterHEADmaster
-rw-r--r--configure.ac2
-rw-r--r--include/dbus-c++/pipe.h1
-rw-r--r--src/pipe.cpp3
3 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index b1f3779..b2f3d64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Autojunk script for libdbus-c++
AC_PREREQ(2.59)
-AC_INIT([libdbus-c++], 0.9.1pw)
+AC_INIT([libdbus-c++], 0.9.2pw)
AC_CONFIG_SRCDIR([src/error.cpp])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/include/dbus-c++/pipe.h b/include/dbus-c++/pipe.h
index 682646c..e599ac0 100644
--- a/include/dbus-c++/pipe.h
+++ b/include/dbus-c++/pipe.h
@@ -29,6 +29,7 @@
/* STD */
#include <cstdlib>
+#include <sys/types.h>
#include <sys/types.h>
diff --git a/src/pipe.cpp b/src/pipe.cpp
index 01211b3..4a91ddd 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -83,5 +83,6 @@ ssize_t Pipe::read(void *buffer, unsigned int &nbytes)
void Pipe::signal()
{
// TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work...
- ::write(_fd_write, '\0', 1);
+ char nullc[1] = {'\0'};
+ ::write(_fd_write, nullc, 1);
}