From 95ff06d610b976dbd88f78a0d209916c463dda91 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 24 Jan 2008 16:39:34 -0700
Subject: [PATCH] Cell: fix asst. warnings

---
 src/mesa/pipe/cell/ppu/cell_batch.h   | 2 ++
 src/mesa/pipe/cell/ppu/cell_clear.c   | 3 ++-
 src/mesa/pipe/cell/ppu/cell_clear.h   | 6 +++---
 src/mesa/pipe/cell/ppu/cell_context.c | 2 +-
 src/mesa/pipe/cell/ppu/cell_flush.c   | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/mesa/pipe/cell/ppu/cell_batch.h b/src/mesa/pipe/cell/ppu/cell_batch.h
index 7a5c6392d74..47e3287626b 100644
--- a/src/mesa/pipe/cell/ppu/cell_batch.h
+++ b/src/mesa/pipe/cell/ppu/cell_batch.h
@@ -29,6 +29,8 @@
 #ifndef CELL_BATCH_H
 #define CELL_BATCH_H
 
+#include "pipe/p_compiler.h"
+
 
 struct cell_context;
 
diff --git a/src/mesa/pipe/cell/ppu/cell_clear.c b/src/mesa/pipe/cell/ppu/cell_clear.c
index 9f7cfdcb461..e01640b9944 100644
--- a/src/mesa/pipe/cell/ppu/cell_clear.c
+++ b/src/mesa/pipe/cell/ppu/cell_clear.c
@@ -39,6 +39,7 @@
 #include "cell_clear.h"
 #include "cell_context.h"
 #include "cell_batch.h"
+#include "cell_flush.h"
 #include "cell_spu.h"
 
 
@@ -47,7 +48,7 @@ cell_clear_surface(struct pipe_context *pipe, struct pipe_surface *ps,
                    unsigned clearValue)
 {
    struct cell_context *cell = cell_context(pipe);
-   uint i;
+   /*uint i;*/
    uint surfIndex;
 
    if (!cell->cbuf_map[0])
diff --git a/src/mesa/pipe/cell/ppu/cell_clear.h b/src/mesa/pipe/cell/ppu/cell_clear.h
index 4c69c4c89f3..ff47d43f4cd 100644
--- a/src/mesa/pipe/cell/ppu/cell_clear.h
+++ b/src/mesa/pipe/cell/ppu/cell_clear.h
@@ -26,8 +26,8 @@
  **************************************************************************/
 
 
-#ifndef CELL_SURFACE_H
-#define CELL_SURFACE_H
+#ifndef CELL_CLEAR_H
+#define CELL_CLEAR_H
 
 
 struct pipe_context;
@@ -40,4 +40,4 @@ cell_clear_surface(struct pipe_context *pipe, struct pipe_surface *ps,
 
 
 
-#endif /* CELL_SURFACE_H */
+#endif /* CELL_CLEAR_H */
diff --git a/src/mesa/pipe/cell/ppu/cell_context.c b/src/mesa/pipe/cell/ppu/cell_context.c
index 98e13d8dde7..8cb0c48f407 100644
--- a/src/mesa/pipe/cell/ppu/cell_context.c
+++ b/src/mesa/pipe/cell/ppu/cell_context.c
@@ -56,7 +56,7 @@ static boolean
 cell_is_format_supported( struct pipe_context *pipe,
                           enum pipe_format format, uint type )
 {
-   struct cell_context *cell = cell_context( pipe );
+   /*struct cell_context *cell = cell_context( pipe );*/
 
    switch (type) {
    case PIPE_TEXTURE:
diff --git a/src/mesa/pipe/cell/ppu/cell_flush.c b/src/mesa/pipe/cell/ppu/cell_flush.c
index 33cbe2a0859..d54eeb8524d 100644
--- a/src/mesa/pipe/cell/ppu/cell_flush.c
+++ b/src/mesa/pipe/cell/ppu/cell_flush.c
@@ -27,6 +27,7 @@
 
 
 #include "cell_context.h"
+#include "cell_batch.h"
 #include "cell_flush.h"
 #include "cell_spu.h"
 #include "cell_render.h"
-- 
2.30.2