Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / mesa / drivers / dri / unichrome / via_screen.c

diff --git a/src/mesa/drivers/dri/unichrome/via_screen.c b/src/mesa/drivers/dri/unichrome/via_screen.c
index ca193bfa53823c76626129f346a76a1227d2c6d5..9c8eb908f160b8a376eee98a044f3e4f524a6b5c 100644 (file)
--- a/src/mesa/drivers/dri/unichrome/via_screen.c
+++ b/src/mesa/drivers/dri/unichrome/via_screen.c
@@ -24,8 +24,8 @@
 
 #include <stdio.h>
 
-#include "utils.h"
 #include "dri_util.h"
+#include "utils.h"
 #include "glheader.h"
 #include "context.h"
 #include "framebuffer.h"
@@ -340,8 +340,8 @@ viaFillInModes( __DRIscreenPrivate *psp,
     /* The 32-bit depth-buffer mode isn't supported yet, so don't actually
      * enable it.
      */
-    static const u_int8_t depth_bits_array[4]   = { 0, 16, 24, 32 };
-    static const u_int8_t stencil_bits_array[4] = { 0,  0,  8,  0 };
+    static const uint8_t depth_bits_array[4]   = { 0, 16, 24, 32 };
+    static const uint8_t stencil_bits_array[4] = { 0,  0,  8,  0 };
     const unsigned depth_buffer_factor = 3;
 
     if ( pixel_bits == 16 ) {