Mesa (master): mesa: remove MAX_GLUSHORT, move MAX_GLUINT

[Brian Paul]

Module: Mesa
Branch: master
Commit: ab68219a59c128e018ba68a287228c24890b8f4f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab68219a59c128e018ba68a287228c24890b8f4f

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Feb 24 15:23:22 2015 -0700

mesa: remove MAX_GLUSHORT, move MAX_GLUINT

The later is only used in one place in swrast.

Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 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.
  */