3 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_ioctl.c b/src/mesa/drivers/dri/i915/intel_ioctl.c
index ede3b6378fe..aa7c6d106ce 100644
--- a/src/mesa/drivers/dri/i915/intel_ioctl.c
+++ b/src/mesa/drivers/dri/i915/intel_ioctl.c
@@ -40,10 +40,10 @@
 #include "intel_batchbuffer.h"
 #include "drm.h"
 
-u_int32_t intelGetLastFrame (intelContextPtr intel) 
+uint32_t intelGetLastFrame (intelContextPtr intel) 
 {
    int ret;
-   u_int32_t frame;
+   uint32_t frame;
    drm_i915_getparam_t gp;
    
    gp.param = I915_PARAM_LAST_DISPATCH;
diff --git a/src/mesa/drivers/dri/i915/intel_ioctl.h b/src/mesa/drivers/dri/i915/intel_ioctl.h
index 6ea47e462e1..8d79e9d73b4 100644
--- a/src/mesa/drivers/dri/i915/intel_ioctl.h
+++ b/src/mesa/drivers/dri/i915/intel_ioctl.h
@@ -67,6 +67,6 @@ extern GLboolean intelIsAgpMemory( intelContextPtr intel, const GLvoid *pointer,
 extern GLuint intelAgpOffsetFromVirtual( intelContextPtr intel, const GLvoid *p );
 
 extern void intelWaitIrq( intelContextPtr intel, int seq );
-extern u_int32_t intelGetLastFrame (intelContextPtr intel);
+extern uint32_t intelGetLastFrame (intelContextPtr intel);
 extern int intelEmitIrqLocked( intelContextPtr intel );
 #endif
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index ca8610b4965..7e7935510a0 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -566,8 +566,8 @@ intelFillInModes( unsigned pixel_bits, unsigned depth_bits,
       GLX_NONE, GLX_SWAP_UNDEFINED_OML, GLX_SWAP_COPY_OML
    };
 
-   u_int8_t depth_bits_array[3];
-   u_int8_t stencil_bits_array[3];
+   uint8_t depth_bits_array[3];
+   uint8_t stencil_bits_array[3];
 
 
    depth_bits_array[0] = 0;