summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-12-06 15:41:43 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-12-06 15:41:43 +0000
commit9580179dfb42d5b81ff6ec9704b82a556c7f1229 (patch)
treeae2a55aa82c4efc43ae832abcf316e1773c228bb /src/mesa/main
parentd5179613d5302173471a6a910fa9ec235c9ff046 (diff)
C++ fixes, mostly casts (Stephane Conversy)
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/texenvprogram.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index a92db42bfd..711464aab2 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -998,7 +998,7 @@ create_new_program(struct state_key *key, GLcontext *ctx,
p.program = program;
p.program->Base.Instructions =
- _mesa_malloc(sizeof(struct prog_instruction) * MAX_INSTRUCTIONS);
+ (struct prog_instruction*) _mesa_malloc(sizeof(struct prog_instruction) * MAX_INSTRUCTIONS);
p.program->Base.NumInstructions = 0;
p.program->Base.Target = GL_FRAGMENT_PROGRAM_ARB;
p.program->NumTexIndirections = 1; /* correct? */