summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nv30
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-01-08 12:41:45 +0000
committerJosé Fonseca <jfonseca@vmware.com>2009-01-08 12:41:45 +0000
commitab3a9f1eeda5b216099763f6eb932da723309f4a (patch)
tree14a28ce3253ba3f080f7cc92b156699ed5b4ddc1 /src/gallium/drivers/nv30
parent395edbc5151b2ce9dd77a22d104ce886e9326354 (diff)
gallium: Replace uint64 by standard uint64_t.
uint64 is not (so?) standard, and often redefined by third parties, causing name clashes.
Diffstat (limited to 'src/gallium/drivers/nv30')
-rw-r--r--src/gallium/drivers/nv30/nv30_query.c4
-rw-r--r--src/gallium/drivers/nv30/nv30_state_emit.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv30/nv30_query.c b/src/gallium/drivers/nv30/nv30_query.c
index d40d75f264..2f974cf5c4 100644
--- a/src/gallium/drivers/nv30/nv30_query.c
+++ b/src/gallium/drivers/nv30/nv30_query.c
@@ -50,7 +50,7 @@ nv30_query_begin(struct pipe_context *pipe, struct pipe_query *pq)
* the existing query to notify completion, but it could be better.
*/
if (q->object) {
- uint64 tmp;
+ uint64_t tmp;
pipe->get_query_result(pipe, pq, 1, &tmp);
}
@@ -80,7 +80,7 @@ nv30_query_end(struct pipe_context *pipe, struct pipe_query *pq)
static boolean
nv30_query_result(struct pipe_context *pipe, struct pipe_query *pq,
- boolean wait, uint64 *result)
+ boolean wait, uint64_t *result)
{
struct nv30_context *nv30 = nv30_context(pipe);
struct nv30_query *q = nv30_query(pq);
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 40fed621b2..9480695d6e 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -49,7 +49,7 @@ nv30_state_emit(struct nv30_context *nv30)
struct nv30_state *state = &nv30->state;
struct nv30_screen *screen = nv30->screen;
unsigned i, samplers;
- uint64 states;
+ uint64_t states;
if (nv30->pctx_id != screen->cur_pctx) {
for (i = 0; i < NV30_STATE_MAX; i++) {