summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTormod Volden <debian.tormod@gmail.com>2011-01-23 12:47:03 +0100
committerAlex Deucher <alexdeucher@gmail.com>2011-01-25 13:27:24 -0500
commit0cbb6d275726aaed648b5ea4dcff45ce14388f91 (patch)
tree7983df3fdcca7ba00ea796053fc060e4311ab41e /src
parentcdfbd9674ccce6d0c96c1b16ad61eac5d5648e43 (diff)
savage: Add casts to silence build warnings
savage_exa.c: In function ‘SavageUploadToScreen’: savage_exa.c:545: warning: passing argument 1 of ‘memcpy’ discards qualifiers from pointer target type /usr/include/bits/string3.h:49: note: expected ‘void * restrict’ but argument is of type ‘volatile CARD32 *’ savage_video.c: In function ‘SavagePutImage’: savage_video.c:2007: warning: format ‘%ld’ expects type ‘long int’, but argument 4 has type ‘drmSize’ savage_video.c:2007: warning: format ‘%ld’ expects type ‘long int’, but argument 5 has type ‘int’
Diffstat (limited to 'src')
-rw-r--r--src/savage_exa.c2
-rw-r--r--src/savage_video.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/savage_exa.c b/src/savage_exa.c
index 8411298..5515f2c 100644
--- a/src/savage_exa.c
+++ b/src/savage_exa.c
@@ -542,7 +542,7 @@ SavageUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int
if (4 * dwords <= queue) {
/* WARNING: breaking BCI_PTR abstraction here */
- memcpy(bci_ptr, srcp, 4 * dwords);
+ memcpy((CARD32 *)bci_ptr, srcp, 4 * dwords);
bci_ptr += dwords;
queue -= 4 * dwords;
} else {
diff --git a/src/savage_video.c b/src/savage_video.c
index 3b991e8..5ee98cb 100644
--- a/src/savage_video.c
+++ b/src/savage_video.c
@@ -2003,8 +2003,8 @@ SavagePutImage(
/* This situation is expected if AGPforXv is disabled, otherwise report. */
if (pSAVAGEDRIServer->agpXVideo.size > 0) {
xf86DrvMsg( pScreen->myNum, X_ERROR,
- "[agp] XVideo: not enough space in buffer (got %ld bytes, required %ld bytes).\n",
- pSAVAGEDRIServer->agpXVideo.size, max(new_size, planarFrameSize));
+ "[agp] XVideo: not enough space in buffer (got %ld bytes, required %d bytes).\n",
+ (long int)pSAVAGEDRIServer->agpXVideo.size, max(new_size, planarFrameSize));
}
pPriv->agpBufferMap = NULL;
pPriv->agpBufferOffset = 0;