From 5989e2d1c4fa997dc2dbd4ea331bf6e77a425aff Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Wed, 29 Feb 2012 19:01:54 +0100 Subject: mingw: use uintptr_t when converting a pointer to an int win64 uses 32 bit long, so we cannot use a long to hold a 64 bit pointer. Thankfully, there's a [u]intptr_t type available exactly for these uses. --- client/canvas.cpp | 2 +- client/cursor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/client/canvas.cpp b/client/canvas.cpp index 139b663b..0986d47b 100644 --- a/client/canvas.cpp +++ b/client/canvas.cpp @@ -70,7 +70,7 @@ void Canvas::clear() void Canvas::begin_draw(SpiceMsgDisplayBase& base, int size, size_t min_size) { - _base = (unsigned long)&base; + _base = (uintptr_t)&base; } void Canvas::draw_fill(SpiceMsgDisplayDrawFill& fill, int size) diff --git a/client/cursor.cpp b/client/cursor.cpp index e9e3006d..0584b884 100644 --- a/client/cursor.cpp +++ b/client/cursor.cpp @@ -64,7 +64,7 @@ CursorData::CursorData(SpiceCursor& cursor, int data_size) } if (data_size < expected_size) { - THROW("access violation 0x%lx %u", (unsigned long)cursor.data, expected_size); + THROW("access violation 0x%lx %u", (uintptr_t)cursor.data, expected_size); } _data = new uint8_t[expected_size]; memcpy(_data, cursor.data, expected_size); -- cgit