3 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/tnl/t_eval_api.c b/src/mesa/tnl/t_eval_api.c
index 08eb9d3562..294f1b742c 100644
--- a/src/mesa/tnl/t_eval_api.c
+++ b/src/mesa/tnl/t_eval_api.c
@@ -120,7 +120,7 @@ _tnl_exec_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
       for (i=i1;i<=i2;i++,u+=du) {
 	 _tnl_eval_coord1f( ctx, u );
       }
-      _tnl_end(ctx);
+      _tnl_end_ctx(ctx);
 
       /* Need this for replay *and* compile:
        */
@@ -190,7 +190,7 @@ _tnl_exec_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
 	       _tnl_eval_coord2f( ctx, u, v );
 	    }
 	 }
-	 _tnl_end(ctx);
+	 _tnl_end_ctx(ctx);
 	 break;
       case GL_LINE:
 	 for (v=v1,j=j1;j<=j2;j++,v+=dv) {
@@ -198,14 +198,14 @@ _tnl_exec_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
 	    for (u=u1,i=i1;i<=i2;i++,u+=du) {
 	       _tnl_eval_coord2f( ctx, u, v );
 	    }
-	    _tnl_end(ctx);
+	    _tnl_end_ctx(ctx);
 	 }
 	 for (u=u1,i=i1;i<=i2;i++,u+=du) {
 	    _tnl_Begin( GL_LINE_STRIP );
 	    for (v=v1,j=j1;j<=j2;j++,v+=dv) {
 	       _tnl_eval_coord2f( ctx, u, v );
 	    }
-	    _tnl_end(ctx);
+	    _tnl_end_ctx(ctx);
 	 }
 	 break;
       case GL_FILL:
@@ -215,7 +215,7 @@ _tnl_exec_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
 	       _tnl_eval_coord2f( ctx, u, v );
 	       _tnl_eval_coord2f( ctx, u, v+dv );
 	    }
-	    _tnl_end(ctx);
+	    _tnl_end_ctx(ctx);
 	 }
 	 break;
       default:
diff --git a/src/mesa/tnl/t_imm_api.c b/src/mesa/tnl/t_imm_api.c
index 0449504300..c0dcb1863c 100644
--- a/src/mesa/tnl/t_imm_api.c
+++ b/src/mesa/tnl/t_imm_api.c
@@ -334,7 +334,7 @@ _tnl_hard_begin( GLcontext *ctx, GLenum p )
  * rects/arrays together in a single immediate struct.
  */
 void
-_tnl_end( GLcontext *ctx )
+_tnl_end_ctx( GLcontext *ctx )
 {
    struct immediate *IM = TNL_CURRENT_IM(ctx);
    GLuint state = IM->BeginState;
@@ -387,7 +387,7 @@ _tnl_End(void)
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _tnl_end( ctx );
+   _tnl_end_ctx( ctx );
 
    /* Need to keep save primitive uptodate in COMPILE and
     * COMPILE_AND_EXEC modes, need to keep exec primitive uptodate
diff --git a/src/mesa/tnl/t_imm_api.h b/src/mesa/tnl/t_imm_api.h
index 1cb89fd4d1..a6a06235c7 100644
--- a/src/mesa/tnl/t_imm_api.h
+++ b/src/mesa/tnl/t_imm_api.h
@@ -42,7 +42,7 @@ extern void _tnl_End(void);
 /* TNL-private internal functions for building higher-level operations:
  */
 extern GLboolean _tnl_hard_begin( GLcontext *ctx, GLenum p );
-extern void _tnl_end( GLcontext *ctx );
+extern void _tnl_end_ctx( GLcontext *ctx );
 extern void _tnl_vertex2f( GLcontext *ctx, GLfloat x, GLfloat y );
 extern void _tnl_eval_coord1f( GLcontext *CC, GLfloat u );
 extern void _tnl_eval_coord2f( GLcontext *CC, GLfloat u, GLfloat v );