summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--dbus/dbus-protocol.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 4a030fad..b42cc929 100644
--- a/NEWS
+++ b/NEWS
@@ -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"
/** @} */