The later is only used in one place in swrast.
---
src/mesa/main/imports.h | 3 ---
src/mesa/swrast/s_tritemp.h | 5 +++++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 82b3213..356f0e1 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -83,9 +83,6 @@ typedef union { GLfloat f; GLint i; GLuint u; } fi_type;
* Math macros
*/
-#define MAX_GLUSHORT 0xffff
-#define MAX_GLUINT 0xffffffff
-
/* Degrees to radians conversion: */
#define DEG2RAD (M_PI/180.0)
diff --git a/src/mesa/swrast/s_tritemp.h b/src/mesa/swrast/s_tritemp.h
index f0281e4..fb73b2d 100644
--- a/src/mesa/swrast/s_tritemp.h
+++ b/src/mesa/swrast/s_tritemp.h
@@ -91,6 +91,11 @@
*/
+#ifndef MAX_GLUINT
+#define MAX_GLUINT 0xffffffff
+#endif
+
+
/*
* Some code we unfortunately need to prevent negative interpolated colors.
*/
--
1.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
