summaryrefslogtreecommitdiff
path: root/src/sna/sna_accel.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-12-05 11:00:44 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2013-12-05 11:00:44 +0000
commit845b03ac110c22cff8b2653e76f6d974a628b776 (patch)
tree856d99c3364dce97d38160175c6e49ffa8148702 /src/sna/sna_accel.c
parentbd22abee8f33b20ff6bc7297b0a9ae8708d18727 (diff)
sna: Compilation fixes for squeeze
Older version of glibc and valgrind require a slight massage. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_accel.c')
-rw-r--r--src/sna/sna_accel.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 622d87b3..61453362 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -4241,9 +4241,8 @@ try_upload_blt(PixmapPtr pixmap, RegionRec *region,
src_bo->pitch = stride;
kgem_bo_mark_unreusable(src_bo);
- DBG(("%s: upload(%d, %d, %d, %d) x %d through a temporary map\n",
- __FUNCTION__, x, y, w, h,
- RegionNumRects(region)));
+ DBG(("%s: upload(%d, %d, %d, %d) x %ld through a temporary map\n",
+ __FUNCTION__, x, y, w, h, (long)RegionNumRects(region)));
if (sigtrap_get() == 0) {
ok = sna->render.copy_boxes(sna, GXcopy,
@@ -16502,7 +16501,9 @@ static void sna_accel_debug_memory(struct sna *sna)
sna->debug_memory.cpu_bo_allocs,
(long)sna->debug_memory.cpu_bo_bytes);
+#ifdef VALGRIND_DO_ADDED_LEAK_CHECK
VG(VALGRIND_DO_ADDED_LEAK_CHECK);
+#endif
}
#else