diff options
| author | José Fonseca <[email protected]> | 2009-01-08 12:41:45 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2009-01-08 12:41:45 +0000 |
| commit | ab3a9f1eeda5b216099763f6eb932da723309f4a (patch) | |
| tree | 14a28ce3253ba3f080f7cc92b156699ed5b4ddc1 /src/gallium/include/pipe | |
| parent | 395edbc5151b2ce9dd77a22d104ce886e9326354 (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/include/pipe')
| -rw-r--r-- | src/gallium/include/pipe/p_compiler.h | 1 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_context.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h index 02a075d3843..bc2a0a7ef3a 100644 --- a/src/gallium/include/pipe/p_compiler.h +++ b/src/gallium/include/pipe/p_compiler.h @@ -96,7 +96,6 @@ typedef int _Bool; typedef unsigned int uint; typedef unsigned char ubyte; typedef unsigned short ushort; -typedef uint64_t uint64; #if 0 #define boolean bool diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h index 2646706ff23..166c6b6b7e0 100644 --- a/src/gallium/include/pipe/p_context.h +++ b/src/gallium/include/pipe/p_context.h @@ -109,7 +109,7 @@ struct pipe_context { boolean (*get_query_result)(struct pipe_context *pipe, struct pipe_query *q, boolean wait, - uint64 *result); + uint64_t *result); /*@}*/ /** |