silence some warnings (Evgeny Kotsuba)
diff --git a/src/mesa/math/m_trans_tmp.h b/src/mesa/math/m_trans_tmp.h
index 9020bca..2ade71e 100644
--- a/src/mesa/math/m_trans_tmp.h
+++ b/src/mesa/math/m_trans_tmp.h
@@ -1,10 +1,8 @@
-/* $Id: m_trans_tmp.h,v 1.7 2002/01/30 16:52:02 brianp Exp $ */
-
/*
* Mesa 3-D graphics library
- * Version: 4.0.2
+ * Version: 5.1
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -224,13 +222,34 @@
}
+#ifdef INIT
#undef INIT
+#endif
+#ifdef DEST_1UI
#undef DEST_1UI
+#endif
+#ifdef DEST_1UB
#undef DEST_1UB
+#endif
+#ifdef DEST_4UB
#undef DEST_4UB
+#endif
+#ifdef DEST_4US
#undef DEST_4US
+#endif
+#ifdef DEST_3F
#undef DEST_3F
+#endif
+#ifdef DEST_4F
#undef DEST_4F
+#endif
+#ifdef DEST_1F
#undef DEST_1F
+#endif
+#ifdef SZ
#undef SZ
+#endif
+#ifdef TAG
#undef TAG
+#endif
+
diff --git a/src/mesa/math/m_translate.c b/src/mesa/math/m_translate.c
index 0c4a1b1..def657e 100644
--- a/src/mesa/math/m_translate.c
+++ b/src/mesa/math/m_translate.c
@@ -1,10 +1,8 @@
-/* $Id: m_translate.c,v 1.11 2003/03/01 01:50:24 brianp Exp $ */
-
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 5.1
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -550,7 +548,9 @@
#undef TAB
+#ifdef CLASS
#undef CLASS
+#endif
#undef ARGS
#undef CHECK
#undef SRC_START
diff --git a/src/mesa/tnl/t_imm_api.c b/src/mesa/tnl/t_imm_api.c
index 0eef3b7..cc7f42f 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 @@
*/
#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 08b74a1..f9a3069 100644
--- a/src/mesa/tnl/t_imm_elt.c
+++ b/src/mesa/tnl/t_imm_elt.c
@@ -584,8 +584,9 @@
#undef CLASS
#undef ARGS
#undef CHECK
+#ifdef START
#undef START
-
+#endif