[cogl] Do not use "near" and "far" variables



commit 3d2564df8f71d6030d9496b7f8e57a27905a4b5a
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Sun Jun 12 10:40:20 2011 +0100

    Do not use "near" and "far" variables
    
    They collide with existing symbols when compiling on Windows.
    
    http://bugzilla.clutter-project.org/show_bug.cgi?id=2667

 cogl/cogl-depth-state.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/cogl/cogl-depth-state.c b/cogl/cogl-depth-state.c
index 076d1b2..c382ec1 100644
--- a/cogl/cogl-depth-state.c
+++ b/cogl/cogl-depth-state.c
@@ -89,12 +89,12 @@ cogl_depth_state_get_test_function (CoglDepthState *state)
 
 void
 cogl_depth_state_set_range (CoglDepthState *state,
-                            float near,
-                            float far)
+                            float near_val,
+                            float far_val)
 {
   g_return_if_fail (state->magic == COGL_DEPTH_STATE_MAGIC);
-  state->range_near = near;
-  state->range_far = far;
+  state->range_near = near_val;
+  state->range_far = far_val;
 }
 
 void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]