summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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;