summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-10-29 15:03:14 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-10-29 15:03:14 +0000
commitdec2a4d4b719069c0a306cc51280cacb1b61a18a (patch)
tree2a95828fad9cf480d5e46dd185f9db74274448c9
parentd3975341e743b3436a69dedd864ccedc56b0db03 (diff)
added some casts for mallocs (bug 630379)
-rw-r--r--src/mesa/drivers/glide/fxdd.c4
-rw-r--r--src/mesa/glapi/glapi.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index 9b98cdd106a..fddd63e4409 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -1,4 +1,4 @@
-/* $Id: fxdd.c,v 1.92 2002/10/04 19:10:10 brianp Exp $ */
+/* $Id: fxdd.c,v 1.93 2002/10/29 15:03:16 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -721,7 +721,7 @@ fxDDInitFxMesaContext(fxMesaContext fxMesa)
}
fxMesa->state = malloc(FX_grGetInteger(FX_GLIDE_STATE_SIZE));
- fxMesa->fogTable = malloc(FX_grGetInteger(FX_FOG_TABLE_ENTRIES) *
+ fxMesa->fogTable = (GrFog_t *) malloc(FX_grGetInteger(FX_FOG_TABLE_ENTRIES) *
sizeof(GrFog_t));
if (!fxMesa->state || !fxMesa->fogTable) {
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index 8649a5241da..fcdab05e412 100644
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -1,4 +1,4 @@
-/* $Id: glapi.c,v 1.66 2002/10/17 16:29:17 brianp Exp $ */
+/* $Id: glapi.c,v 1.67 2002/10/29 15:03:14 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -546,7 +546,7 @@ generate_entrypoint(GLuint functionOffset)
0xe8, 0x00, 0x00, 0x00, 0x00,
0xff, 0xa0, 0x00, 0x00, 0x00, 0x00
};
- unsigned char *code = malloc(sizeof(insn_template));
+ unsigned char *code = (unsigned char *) malloc(sizeof(insn_template));
unsigned int next_insn;
if (code) {
memcpy(code, insn_template, sizeof(insn_template));
@@ -583,7 +583,7 @@ generate_entrypoint(GLuint functionOffset)
0x01000000 /* nop */
};
#endif
- unsigned int *code = malloc(sizeof(insn_template));
+ unsigned int *code = (unsigned int *) malloc(sizeof(insn_template));
unsigned long glapi_addr = (unsigned long) &_glapi_Dispatch;
if (code) {
memcpy(code, insn_template, sizeof(insn_template));