diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-06 12:12:57 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-14 10:13:45 +1000 |
| commit | 0b4e6af857bcc5513e4c19912a54656d4696e56d (patch) | |
| tree | a3c8699c661c1760caa35459f4e011bc056c8e74 /hw | |
| parent | ad508c93c239a5ba8381000c031e96caf2769265 (diff) | |
xquartz: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xquartz/pseudoramiX.c | 2 | ||||
| -rw-r--r-- | hw/xquartz/xpr/xprCursor.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c index f4ceff32b..1de7af6dc 100644 --- a/hw/xquartz/pseudoramiX.c +++ b/hw/xquartz/pseudoramiX.c @@ -307,7 +307,7 @@ static int ProcPseudoramiXQueryScreens(ClientPtr client) rep.type = X_Reply; rep.sequenceNumber = client->sequence; rep.number = noPseudoramiXExtension ? 0 : pseudoramiXNumScreens; - rep.length = rep.number * sz_XineramaScreenInfo >> 2; + rep.length = bytes_to_int32(rep.number * sz_XineramaScreenInfo); if (client->swapped) { register int n; swaps (&rep.sequenceNumber, n); diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c index 4345beea4..8c47b671c 100644 --- a/hw/xquartz/xpr/xprCursor.c +++ b/hw/xquartz/xpr/xprCursor.c @@ -128,7 +128,7 @@ load_cursor(CursorPtr src, int screen) while (ycount-- > 0) { - xcount = (src->bits->width + 7) / 8; + xcount = bits_to_bytes(src->bits->width); sptr = srow; mptr = mrow; dptr = drow; |