summaryrefslogtreecommitdiff
path: root/src/mesa/tnl
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/tnl')
-rw-r--r--src/mesa/tnl/t_imm_api.c5
-rw-r--r--src/mesa/tnl/t_imm_elt.c3
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/tnl/t_imm_api.c b/src/mesa/tnl/t_imm_api.c
index 0eef3b735c..cc7f42f384 100644
--- a/src/mesa/tnl/t_imm_api.c
+++ b/src/mesa/tnl/t_imm_api.c
@@ -1,5 +1,3 @@
-/* $Id: t_imm_api.c,v 1.40 2003/03/31 18:19:56 brianp Exp $ */
-
/*
* Mesa 3-D graphics library
* Version: 5.1
@@ -405,7 +403,8 @@ _tnl_End(void)
*/
#define CHECK_ATTRIB_ARRAY(IM, ATTR) \
if (!IM->Attrib[ATTR]) { \
- IM->Attrib[ATTR] = _mesa_malloc(IMM_SIZE * 4 * sizeof(GLfloat)); \
+ IM->Attrib[ATTR] = \
+ (GLfloat (*)[4]) _mesa_malloc(IMM_SIZE * 4 * sizeof(GLfloat)); \
if (!IM->Attrib[ATTR]) { \
GET_CURRENT_CONTEXT(ctx); \
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glVertex/Normal/etc"); \
diff --git a/src/mesa/tnl/t_imm_elt.c b/src/mesa/tnl/t_imm_elt.c
index 08b74a139b..f9a3069a17 100644
--- a/src/mesa/tnl/t_imm_elt.c
+++ b/src/mesa/tnl/t_imm_elt.c
@@ -584,8 +584,9 @@ static void init_translate_elt(void)
#undef CLASS
#undef ARGS
#undef CHECK
+#ifdef START
#undef START
-
+#endif