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.

diff --git a/src/mesa/drivers/dri/s3v/s3v_state.c b/src/mesa/drivers/dri/s3v/s3v_state.c
index c71c89a..561f42c 100644 (file)
--- 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));