diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2012-02-29 19:01:54 +0100 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2012-03-04 10:50:38 +0200 |
| commit | 5989e2d1c4fa997dc2dbd4ea331bf6e77a425aff (patch) | |
| tree | 6901792524e1786eb1c3c6c2843d4451963b3812 /client | |
| parent | 534b71dfaaf78e8ab2991bbb105f5601f23e7e16 (diff) | |
| download | spice-5989e2d1c4fa997dc2dbd4ea331bf6e77a425aff.tar.gz spice-5989e2d1c4fa997dc2dbd4ea331bf6e77a425aff.tar.xz spice-5989e2d1c4fa997dc2dbd4ea331bf6e77a425aff.zip | |
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.
Diffstat (limited to 'client')
| -rw-r--r-- | client/canvas.cpp | 2 | ||||
| -rw-r--r-- | client/cursor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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); |