From c14103be50529f3d00cf1ecadafc0f8156ba7680 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 18 Oct 2018 15:30:14 +0200 Subject: Update dbus header and document its provenance There's been one minor change in a struct and some minor re-ordering of other things within their files (reflected here to simplify future checks); and qt_attribution.json didn't document enough details to ensure reliable review. Task-number: QTBUG-70011 Change-Id: Iccff9cfd899e58cb42837c4628acacd7877c5b01 Reviewed-by: Volker Hilsheimer --- src/dbus/dbus_minimal_p.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/dbus/dbus_minimal_p.h') diff --git a/src/dbus/dbus_minimal_p.h b/src/dbus/dbus_minimal_p.h index b52b0153e4..869c02b59d 100644 --- a/src/dbus/dbus_minimal_p.h +++ b/src/dbus/dbus_minimal_p.h @@ -218,7 +218,7 @@ struct DBusMessageIter int dummy10; /**< Don't use this */ int dummy11; /**< Don't use this */ int pad1; /**< Don't use this */ - int pad2; /**< Don't use this */ + void *pad2; /**< Don't use this */ /* Was int; changed to void* at 1.10.8 */ void *pad3; /**< Don't use this */ }; @@ -251,6 +251,7 @@ struct DBusMessageIter #define DBUS_TYPE_SIGNATURE_AS_STRING "g" #define DBUS_TYPE_UNIX_FD ((int) 'h') #define DBUS_TYPE_UNIX_FD_AS_STRING "h" + #define DBUS_TYPE_ARRAY ((int) 'a') #define DBUS_TYPE_ARRAY_AS_STRING "a" #define DBUS_TYPE_VARIANT ((int) 'v') @@ -270,14 +271,14 @@ struct DBusMessageIter #define DBUS_DICT_ENTRY_END_CHAR ((int) '}') #define DBUS_DICT_ENTRY_END_CHAR_AS_STRING "}" +#define DBUS_MAXIMUM_NAME_LENGTH 255 + #define DBUS_MESSAGE_TYPE_INVALID 0 #define DBUS_MESSAGE_TYPE_METHOD_CALL 1 #define DBUS_MESSAGE_TYPE_METHOD_RETURN 2 #define DBUS_MESSAGE_TYPE_ERROR 3 #define DBUS_MESSAGE_TYPE_SIGNAL 4 -#define DBUS_MAXIMUM_NAME_LENGTH 255 - #define DBUS_INTROSPECT_1_0_XML_NAMESPACE "http://www.freedesktop.org/standards/dbus" #define DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" #define DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" -- cgit v1.2.3