From bc2429b9174ac2d3c56b7fd35884b0d89ec7fb02 Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Fri, 4 Feb 2011 09:06:05 +0100 Subject: vnc: use the new generic bitmap functions Switch to bitmap.h and bitops.h instead of redefining our own bitmap helpers. Signed-off-by: Corentin Chary Signed-off-by: Anthony Liguori --- ui/vnc.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ui/vnc.h') diff --git a/ui/vnc.h b/ui/vnc.h index 706ba3c224..98a1885580 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -35,6 +35,7 @@ #include "console.h" #include "monitor.h" #include "audio/audio.h" +#include "bitmap.h" #include #include @@ -80,7 +81,7 @@ typedef void VncSendHextileTile(VncState *vs, #define VNC_MAX_WIDTH 2560 #define VNC_MAX_HEIGHT 2048 -#define VNC_DIRTY_WORDS (VNC_MAX_WIDTH / (16 * 32)) +#define VNC_DIRTY_WORDS (VNC_MAX_WIDTH / (16 * BITS_PER_LONG)) #define VNC_STAT_RECT 64 #define VNC_STAT_COLS (VNC_MAX_WIDTH / VNC_STAT_RECT) @@ -113,7 +114,7 @@ typedef struct VncRectStat VncRectStat; struct VncSurface { struct timeval last_freq_check; - uint32_t dirty[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS]; + unsigned long dirty[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS]; VncRectStat stats[VNC_STAT_ROWS][VNC_STAT_COLS]; DisplaySurface *ds; }; @@ -232,7 +233,7 @@ struct VncState int csock; DisplayState *ds; - uint32_t dirty[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS]; + unsigned long dirty[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS]; uint8_t **lossy_rect; /* Not an Array to avoid costly memcpy in * vnc-jobs-async.c */ -- cgit v1.2.1