[PATCH v2] dbus: Change type for pointer / integer cast to fix 32-bit break

[PATCH v2] dbus: Change type for pointer / integer cast to fix 32-bit break

[Mat Martineau]

[-- Attachment #1: Type: text/plain, Size: 1135 bytes --]

Casting void* to uint64_t on 32-bit x86 causes a build error with gcc
5.3.1, so cast to uintptr_t instead.
---
 ell/dbus-kernel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ell/dbus-kernel.c b/ell/dbus-kernel.c
index 6ce3e6f..8e4e552 100644
--- a/ell/dbus-kernel.c
+++ b/ell/dbus-kernel.c
@@ -385,7 +385,7 @@ int _dbus_kernel_send(int fd, size_t bloom_size, uint8_t bloom_n_hash,
 	header = _dbus_message_get_header(message, &header_size);
 	item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(struct kdbus_vec);
 	item->type = KDBUS_ITEM_PAYLOAD_VEC;
-	item->vec.address = (uint64_t) header;
+	item->vec.address = (uintptr_t) header;
 	item->vec.size = header_size;
 	item = KDBUS_ITEM_NEXT(item);
 
@@ -393,7 +393,7 @@ int _dbus_kernel_send(int fd, size_t bloom_size, uint8_t bloom_n_hash,
 	if (body_size > 0) {
 		item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(struct kdbus_vec);
 		item->type = KDBUS_ITEM_PAYLOAD_VEC;
-		item->vec.address = (uint64_t) body;
+		item->vec.address = (uintptr_t) body;
 		item->vec.size = body_size;
 		item = KDBUS_ITEM_NEXT(item);
 	}
-- 
2.7.3

Re: [PATCH v2] dbus: Change type for pointer / integer cast to fix 32-bit break

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

Hi Mat,

On 03/14/2016 10:19 AM, Mat Martineau wrote:
> Casting void* to uint64_t on 32-bit x86 causes a build error with gcc
> 5.3.1, so cast to uintptr_t instead.
> ---
>   ell/dbus-kernel.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>

Applied after tweaking the commit description.  Remember item M5 ;)

Regards,
-Denis