From: Karl Schultz <kschultz@freedesktop.org>
Date: Mon, 26 Nov 2001 22:55:28 +0000 (+0000)
Subject: avoid using near and far as variable names since they are reserved words
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=20517ce040bc9462129d286f084bfc5a50c587e4;p=mesa.git

avoid using near and far as variable names since they are reserved words
in the windows compiler.
---

diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 76ec6cbf8f2..f382b2afab9 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -1487,9 +1487,9 @@ KEYWORD1 GLboolean KEYWORD2 NAME(IsList)(GLuint list)
    RETURN_DISPATCH(IsList, (list), (F, "glIsList(%d);", list));
 }
 
-KEYWORD1 void KEYWORD2 NAME(DepthRange)(GLclampd near, GLclampd far)
+KEYWORD1 void KEYWORD2 NAME(DepthRange)(GLclampd zNear, GLclampd zFar)
 {
-   DISPATCH(DepthRange, (near, far), (F, "glDepthRange(%f, %f);", near, far));
+   DISPATCH(DepthRange, (zNear, zFar), (F, "glDepthRange(%f, %f);", zNear, zFar));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Frustum)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)