diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-20 11:32:44 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-20 11:32:44 +0000 |
| commit | 1eba10ad373a0ada9d36f29d0024fc8c46911163 (patch) | |
| tree | 2c3df4a4f6a2c5d578f36a59880600d7269640b4 | |
| parent | 41116034b2aff2ab062d4f3476333edbdb80580c (diff) | |
| parent | 302c35b03f682644253f504ccf885a972f645e0d (diff) | |
| download | dbus-1eba10ad373a0ada9d36f29d0024fc8c46911163.tar.gz | |
Merge branch 'dbus-1.4'
Conflicts:
NEWS
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | dbus/dbus-protocol.h | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -49,6 +49,8 @@ D-Bus 1.5.10 (UNRELEASED) • Improve the dbus-send(1) man page (fd.o #14005, Simon McVittie) +• Make dbus-protocol.h compatible with C++11 (fd.o #46147, Marc Mutz) + • Unix-specific: · Use epoll(7) for a more efficient main loop in Linux; equivalent patches welcomed for other OSs' equivalents like kqueue, /dev/poll, or Solaris diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h index 8aa15e53..60605ab2 100644 --- a/dbus/dbus-protocol.h +++ b/dbus/dbus-protocol.h @@ -456,7 +456,7 @@ extern "C" { /** XML system identifier of the introspection format version 1.0 */ #define DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" /** XML document type declaration of the introspection format version 1.0 */ -#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \""DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER"\"\n\""DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER"\">\n" +#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \"" DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER "\"\n\"" DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "\">\n" /** @} */ |