minor changes to silence warnings

diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c
index 9ca262b4b28d08ce4ab125d50e39f66da2cc8a18..d81431765fa330bd4f4119fd81b21c3d60168402 100644 (file)
--- a/src/mesa/drivers/dri/i810/i810context.c
+++ b/src/mesa/drivers/dri/i810/i810context.c
@@ -185,7 +185,7 @@ i810CreateContext( const __GLcontextModes *mesaVis,
            12,
            I810_NR_TEX_REGIONS,
            imesa->sarea->texList,
-           & imesa->sarea->texAge,
+           (unsigned *) & imesa->sarea->texAge, /* XXX we shouldn't cast! */
            & imesa->swapped,
            sizeof( struct i810_texture_object_t ),
            (destroy_texture_object_t *) i810DestroyTexObj );
@@ -327,7 +327,7 @@ i810DestroyContext(__DRIcontextPrivate *driContextPriv)
         assert( is_empty_list( & imesa->swapped ) );
       }
 
-      Xfree(imesa);
+      FREE(imesa);
    }
 }
 

diff --git a/src/mesa/drivers/dri/i830/i830_context.c b/src/mesa/drivers/dri/i830/i830_context.c
index 7b68d6561f152dfe92fbcb3197b51b51ca0422b7..2860113ecaf2afaa937b11c3d14842b0a5e2ded2 100644 (file)
--- a/src/mesa/drivers/dri/i830/i830_context.c
+++ b/src/mesa/drivers/dri/i830/i830_context.c
@@ -245,7 +245,7 @@ GLboolean i830CreateContext( const __GLcontextModes *mesaVis,
            12,
            I830_NR_TEX_REGIONS,
            imesa->sarea->texList,
-           & imesa->sarea->texAge,
+           (unsigned) & imesa->sarea->texAge, /* XXX shouldn't need cast! */
            & imesa->swapped,
            sizeof( struct i830_texture_object_t ),
            (destroy_texture_object_t *) i830DestroyTexObj );
@@ -415,7 +415,7 @@ void i830DestroyContext(__DRIcontextPrivate *driContextPriv)
         assert( is_empty_list( & imesa->swapped ) );
       }
 
-      Xfree (imesa);
+      FREE(imesa);
    }
 }
 

diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
index def5d86fbbbcc99bc28389ae1bde34ee0eef1712..8b945a01478763137525ef1e6d461c4360c0a428 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_state.c
+++ b/src/mesa/drivers/dri/r200/r200_state.c
@@ -39,6 +39,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "api_arrayelt.h"
 #include "enums.h"
 #include "colormac.h"
+#include "light.h"
 
 #include "swrast/swrast.h"
 #include "array_cache/acache.h"

diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
index d3d0d04c03d32895b8bba0e2a7884eef1d3ddeea..cb381ef6de2ace4a7a1719f251c664c2333cfba1 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
+++ b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
@@ -38,6 +38,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "mtypes.h"
 
 #include "array_cache/acache.h"
+#include "math/m_translate.h"
 #include "tnl/tnl.h"
 #include "tnl/t_pipeline.h"
 

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c
index 8dba39b87073e84e975806871ce4451ffb212a1d..ae79c55b39182518ba078b6340be5f51043fdeb1 100644 (file)
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c
@@ -495,7 +495,7 @@ tdfxDestroyContext( __DRIcontextPrivate *driContextPriv )
       _mesa_destroy_context(fxMesa->glCtx);
 
       /* free the tdfx context */
-      XFree( fxMesa );
+      FREE( fxMesa );
    }
 }