mesa: standardize on C99's uint*_t instead of u_int*_t

[mesa.git] / src / mesa / drivers / dri / ffb / ffb_xmesa.c

diff --git a/src/mesa/drivers/dri/ffb/ffb_xmesa.c b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
index 7fd4e570d3372b049850d6bdca2b1db042320def..2a2cf5ec06a97f11019e766b713877053edba617 100644 (file)
--- a/src/mesa/drivers/dri/ffb/ffb_xmesa.c
+++ b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
@@ -26,12 +26,12 @@
  */
 
 #include "ffb_xmesa.h"
-#include "context.h"
-#include "framebuffer.h"
-#include "matrix.h"
-#include "renderbuffer.h"
-#include "simple_list.h"
-#include "imports.h"
+#include "main/context.h"
+#include "main/framebuffer.h"
+#include "main/matrix.h"
+#include "main/renderbuffer.h"
+#include "main/simple_list.h"
+#include "main/imports.h"
 #include "utils.h"
 
 #include "swrast/swrast.h"
@@ -226,7 +226,7 @@ ffbCreateContext(const __GLcontextModes *mesaVis,
        fmesa->driScreen = sPriv;
        fmesa->ffb_sarea = FFB_DRISHARE(sPriv->pSAREA);
 
-       /* Register and framebuffer hw pointers. */
+       /* Register and framebuffer pointers. */
        fmesa->regs = ffbScreen->regs;
        fmesa->sfb32 = ffbScreen->sfb32;
 
@@ -624,8 +624,8 @@ ffbFillInModes( __DRIscreenPrivate *psp,
       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;
    depth_bits_array[1] = depth_bits;