Demos (master): cuberender: Fix Windows builds.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Tue Jun 7 18:12:12 UTC 2011


Module: Demos
Branch: master
Commit: db3b323ba284d76e2d5169845419a3d852c6a2be
URL:    http://cgit.freedesktop.org/mesa/demos/commit/?id=db3b323ba284d76e2d5169845419a3d852c6a2be

Author: José Fonseca <jfonseca at vmware.com>
Date:   Tue Jun  7 19:11:22 2011 +0100

cuberender: Fix Windows builds.

Windows defines near/far symbols.

---

 src/demos/cuberender.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/demos/cuberender.c b/src/demos/cuberender.c
index 522c45f..499265d 100644
--- a/src/demos/cuberender.c
+++ b/src/demos/cuberender.c
@@ -203,11 +203,11 @@ DrawShinySphere(void)
 static void
 SetupCubeFaceView(GLenum face, const GLfloat centerPos[4])
 {
-   GLfloat near = 0.5, far = 20.0;
+   GLfloat near_val = 0.5, far_val = 20.0;
 
    glMatrixMode(GL_PROJECTION);
    glLoadIdentity();
-   glFrustum(-near, near, -near, near, near, far);
+   glFrustum(-near_val, near_val, -near_val, near_val, near_val, far_val);
 
    glMatrixMode(GL_MODELVIEW);
    glLoadIdentity();




More information about the mesa-commit mailing list