Merge commit 'origin/gallium-0.2' into gallium-xlib-rework

[mesa.git] / src / gallium / drivers / nv50 / nv50_query.c

diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
index 26bd90ccc5e2f2bda2274ac0021900c07e8200f7..777e77906d5a380996dca49f174596b13460d8cb 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_query.c
+++ b/src/gallium/drivers/nv50/nv50_query.c
@@ -51,7 +51,7 @@ nv50_query_end(struct pipe_context *pipe, struct pipe_query *q)
 
 static boolean
 nv50_query_result(struct pipe_context *pipe, struct pipe_query *q,
-                 boolean wait, uint64 *result)
+                 boolean wait, uint64_t *result)
 {
        NOUVEAU_ERR("unimplemented\n");
        *result = 0xdeadcafe;