From f30e4af73405aad3ec29b7337a3a0177e3fbe715 Mon Sep 17 00:00:00 2001 From: Daniel Zhu Date: Fri, 20 Jun 2008 17:51:39 -0700 Subject: [PATCH] Rename quad function to quadr to avoid clash with Solaris quad typedef Signed-off-by: Brian Paul --- src/mesa/tnl_dd/t_dd_tritmp.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/tnl_dd/t_dd_tritmp.h b/src/mesa/tnl_dd/t_dd_tritmp.h index 6c2378f5e8a..2bb890593b1 100644 --- a/src/mesa/tnl_dd/t_dd_tritmp.h +++ b/src/mesa/tnl_dd/t_dd_tritmp.h @@ -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); -- 2.30.2