summaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
Diffstat (limited to 'dbus')
-rw-r--r--dbus/dbus-keyring.c2
-rw-r--r--dbus/dbus-message.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index d1444350..9877dca6 100644
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -291,7 +291,7 @@ add_new_key (DBusKey **keys_p,
DBusKey *new;
DBusString bytes;
int id;
- unsigned long timestamp;
+ long timestamp;
const unsigned char *s;
dbus_bool_t retval;
DBusKey *keys;
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index dc0a6a64..b191337e 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -5480,8 +5480,10 @@ _dbus_message_loader_queue_messages (DBusMessageLoader *loader)
return TRUE;
}
- header_len_unsigned = _dbus_unpack_uint32 (byte_order, header_data + 4);
- body_len_unsigned = _dbus_unpack_uint32 (byte_order, header_data + 8);
+ header_len_unsigned = _dbus_unpack_uint32 (byte_order,
+ (const unsigned char *) header_data + 4);
+ body_len_unsigned = _dbus_unpack_uint32 (byte_order,
+ (const unsigned char *) header_data + 8);
if (header_len_unsigned < 16)
{