5 files changed, 17 insertions, 17 deletions

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.h b/src/mesa/drivers/dri/nouveau/nouveau_context.h
index 9a0be2cb2a..db4d4cb6b7 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h
@@ -46,13 +46,13 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 typedef struct nouveau_fifo_t{
 	int channel;
-	u_int32_t* buffer;
-	u_int32_t* mmio;
-	u_int32_t put_base;
-	u_int32_t current;
-	u_int32_t put;
-	u_int32_t free;
-	u_int32_t max;
+	uint32_t* buffer;
+	uint32_t* mmio;
+	uint32_t put_base;
+	uint32_t current;
+	uint32_t put;
+	uint32_t free;
+	uint32_t max;
 }
 nouveau_fifo;
 
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fifo.c b/src/mesa/drivers/dri/nouveau/nouveau_fifo.c
index 7b5e96b4c2..5eb53aa46c 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_fifo.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fifo.c
@@ -45,12 +45,12 @@ int nouveau_fifo_remaining=0;
 
 #define RING_SKIPS 8
 
-void WAIT_RING(nouveauContextPtr nmesa,u_int32_t size)
+void WAIT_RING(nouveauContextPtr nmesa,uint32_t size)
 {
 #ifdef NOUVEAU_RING_DEBUG
 	return;
 #endif
-	u_int32_t fifo_get;
+	uint32_t fifo_get;
 	while(nmesa->fifo.free < size+1) {
 		fifo_get = NV_FIFO_READ_GET();
 
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fifo.h b/src/mesa/drivers/dri/nouveau/nouveau_fifo.h
index 23325dcea5..67f9cd4fc8 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_fifo.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fifo.h
@@ -44,10 +44,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NOUVEAU_RING_TRACE 1
 #endif
 
-#define NV_READ(reg) *(volatile u_int32_t *)(nmesa->mmio + (reg))
+#define NV_READ(reg) *(volatile uint32_t *)(nmesa->mmio + (reg))
 
-#define NV_FIFO_READ(reg) *(volatile u_int32_t *)(nmesa->fifo.mmio + (reg/4))
-#define NV_FIFO_WRITE(reg,value) *(volatile u_int32_t *)(nmesa->fifo.mmio + (reg/4)) = value;
+#define NV_FIFO_READ(reg) *(volatile uint32_t *)(nmesa->fifo.mmio + (reg/4))
+#define NV_FIFO_WRITE(reg,value) *(volatile uint32_t *)(nmesa->fifo.mmio + (reg/4)) = value;
 #define NV_FIFO_READ_GET() ((NV_FIFO_READ(NV03_FIFO_REGS_DMAGET) - nmesa->fifo.put_base) >> 2)
 #define NV_FIFO_WRITE_PUT(val) do { \
 	if (NOUVEAU_RING_TRACE) {\
@@ -136,7 +136,7 @@ if (NOUVEAU_RING_TRACE) \
 
 #endif
 
-extern void WAIT_RING(nouveauContextPtr nmesa,u_int32_t size);
+extern void WAIT_RING(nouveauContextPtr nmesa,uint32_t size);
 extern void nouveau_state_cache_flush(nouveauContextPtr nmesa);
 extern void nouveau_state_cache_init(nouveauContextPtr nmesa);
 
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 69b0691bb7..2cf6f979e4 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -257,8 +257,8 @@ nouveauFillInModes( unsigned pixel_bits, unsigned depth_bits,
 		GLX_NONE, GLX_SWAP_UNDEFINED_OML, GLX_SWAP_COPY_OML
 	};
 
-	u_int8_t depth_bits_array[4]   = { 0, 16, 24, 24 };
-	u_int8_t stencil_bits_array[4] = { 0,  0,  0,  8 };
+	uint8_t depth_bits_array[4]   = { 0, 16, 24, 24 };
+	uint8_t stencil_bits_array[4] = { 0,  0,  0,  8 };
 
 	depth_buffer_factor = 4;
 	back_buffer_factor  = (have_back_buffer) ? 3 : 1;
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.h b/src/mesa/drivers/dri/nouveau/nouveau_screen.h
index decdafa86d..bbe5810128 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.h
@@ -35,8 +35,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 typedef struct {
 	nouveau_card* card;
-	u_int32_t bus_type;
-	u_int32_t agp_mode;
+	uint32_t bus_type;
+	uint32_t agp_mode;
 
         GLint fbFormat;