[cogl/msvc-support] Revert "Do not use "near" and "far" variables"



commit ddad699a3a83b881ef9c6c1baba5943a922cb29e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Sep 15 22:55:29 2011 +0800

    Revert "Do not use "near" and "far" variables"
    
    This reverts commit d1decd2d1a0edd3b292f64bc03621dd3f2f40e56.
    
    Since 01e1260aa the 'near' and 'far' defines are now undef'd on Windows
    so we no longer have to remember not to use them in Cogl code.

 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 c382ec1..076d1b2 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_val,
-                            float far_val)
+                            float near,
+                            float far)
 {
   g_return_if_fail (state->magic == COGL_DEPTH_STATE_MAGIC);
-  state->range_near = near_val;
-  state->range_far = far_val;
+  state->range_near = near;
+  state->range_far = far;
 }
 
 void



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