summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-01-18 17:22:50 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-01-18 17:22:50 +0000
commit77d240858e83cdaae799ef95188f59b7f2eda464 (patch)
treea2432212101d83809d690c6ac830343c7f3bb58f /src/mesa
parent6a82d44d9cb25b8ef1e1697adfcfe91a964c221f (diff)
minor changes to silence warnings
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i810/i810context.c4
-rw-r--r--src/mesa/drivers/dri/i830/i830_context.c4
-rw-r--r--src/mesa/drivers/dri/r200/r200_state.c1
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_maos_verts.c1
-rw-r--r--src/mesa/drivers/dri/tdfx/tdfx_context.c2
5 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c
index 9ca262b4b2..d81431765f 100644
--- 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 7b68d6561f..2860113eca 100644
--- 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 def5d86fbb..8b945a0147 100644
--- 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 d3d0d04c03..cb381ef6de 100644
--- 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 8dba39b870..ae79c55b39 100644
--- 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 );
}
}