summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-09-01 12:31:24 -0700
committerIan Romanick <ian.d.romanick@intel.com>2009-09-03 11:22:47 -0700
commit19420f02d4540654731840e345bdcd367389ed40 (patch)
treee92cc03b2986a6ee628f8e69c06f4ed0625a8859 /src/mesa/drivers
parentafd6141934a0fb52fc1739a2a9992db3ac34682b (diff)
s3v: Fix driver build for ARB_sync.
This driver was including Xlibint.h to get the CARD32 typedef to use for 32-bit unsigned integers, which #defined Status to something. CARD32 isn't actually a 32-bit unsigned integer, so replacing with uint32_t usage should fix bugs on 64-bit along with the build.
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/s3v/s3v_state.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/s3v/s3v_state.c b/src/mesa/drivers/dri/s3v/s3v_state.c
index c71c89a3e1..561f42c705 100644
--- a/src/mesa/drivers/dri/s3v/s3v_state.c
+++ b/src/mesa/drivers/dri/s3v/s3v_state.c
@@ -2,7 +2,6 @@
* Author: Max Lingua <sunmax@libero.it>
*/
-#include <X11/Xlibint.h>
#include "s3v_context.h"
#include "s3v_macros.h"
#include "s3v_dri.h"
@@ -24,7 +23,7 @@
static void s3vUpdateAlphaMode( GLcontext *ctx )
{
s3vContextPtr vmesa = S3V_CONTEXT(ctx);
- CARD32 cmd = vmesa->CMD;
+ uint32_t cmd = vmesa->CMD;
cmd &= ~ALPHA_BLEND_MASK;
if ( ctx->Color.BlendEnabled ) {
@@ -173,7 +172,7 @@ static void s3vDDClear( GLcontext *ctx, GLbitfield mask )
static void s3vUpdateZMode( GLcontext *ctx )
{
s3vContextPtr vmesa = S3V_CONTEXT(ctx);
- CARD32 cmd = vmesa->CMD;
+ uint32_t cmd = vmesa->CMD;
DEBUG(("Depth.Test = %i\n", ctx->Depth.Test));
DEBUG(("CMD was = 0x%x ", cmd));