diff options
| author | Daniel Zhu <daniel.zhu@sun.com> | 2008-06-20 17:51:39 -0700 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-06-21 10:19:45 -0600 |
| commit | f30e4af73405aad3ec29b7337a3a0177e3fbe715 (patch) | |
| tree | 8d9104c54017ba4552489baa706381162218df4e | |
| parent | 1043a7c71ab6b655fa3345dd34df0a5e84f3e031 (diff) | |
| download | external_mesa3d-f30e4af73405aad3ec29b7337a3a0177e3fbe715.zip external_mesa3d-f30e4af73405aad3ec29b7337a3a0177e3fbe715.tar.gz external_mesa3d-f30e4af73405aad3ec29b7337a3a0177e3fbe715.tar.bz2 | |
Rename quad function to quadr to avoid clash with Solaris quad typedef
Signed-off-by: Brian Paul <brian.paul@tungstengraphics.com>
| -rw-r--r-- | src/mesa/tnl_dd/t_dd_tritmp.h | 6 |
1 files 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 6c2378f..2bb8905 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); |