Rename quad function to quadr to avoid clash with Solaris quad typedef
authorDaniel Zhu <daniel.zhu@sun.com>
Sat, 21 Jun 2008 00:51:39 +0000 (17:51 -0700)
committerBrian Paul <brian.paul@tungstengraphics.com>
Sat, 21 Jun 2008 16:19:45 +0000 (10:19 -0600)
Signed-off-by: Brian Paul <brian.paul@tungstengraphics.com>
src/mesa/tnl_dd/t_dd_tritmp.h

index 6c2378f5e8a5161cf9b81da63fb14c6522536585..2bb890593b1b8cef7b5e87d7a616819d53a4f67a 100644 (file)
@@ -389,7 +389,7 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
 
 #if DO_QUAD
 #if DO_FULL_QUAD
-static void TAG(quad)( GLcontext *ctx,
+static void TAG(quadr)( GLcontext *ctx,
                       GLuint e0, GLuint e1, GLuint e2, GLuint e3 )
 {
    struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
@@ -673,7 +673,7 @@ static void TAG(quad)( GLcontext *ctx,
    }
 }
 #else
-static void TAG(quad)( GLcontext *ctx, GLuint e0,
+static void TAG(quadr)( GLcontext *ctx, GLuint e0,
                       GLuint e1, GLuint e2, GLuint e3 )
 {
    if (DO_UNFILLED) {
@@ -765,7 +765,7 @@ static void TAG(points)( GLcontext *ctx, GLuint first, GLuint last )
 static void TAG(init)( void )
 {
 #if DO_QUAD
-   TAB[IND].quad = TAG(quad);
+   TAB[IND].quad = TAG(quadr);
 #endif
 #if DO_TRI
    TAB[IND].triangle = TAG(triangle);