From: Robert Bragg <robert@linux.intel.com>
Date: Wed, 8 Dec 2010 11:30:00 +0000 (+0000)
Subject: pipeline: don't use near/far symbols
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea66156c83dded1536009bbdd02032e5e3114c3a;p=profile%2Fivi%2Fclutter.git

pipeline: don't use near/far symbols

According to 9cc90333473e3 the windows headers #define near as nothing,
and presumable the same is true for 'far' too. Apparently this define is
to improve compatibility with code written for Windows 3.1, so it's good
that people will be able to incorporate such code into their Clutter
applications.
---

diff --git a/clutter/cogl/cogl/cogl-pipeline.c b/clutter/cogl/cogl/cogl-pipeline.c
index b6e0ce8..970ded0 100644
--- a/clutter/cogl/cogl/cogl-pipeline.c
+++ b/clutter/cogl/cogl/cogl-pipeline.c
@@ -5902,11 +5902,11 @@ _cogl_pipeline_hash_depth_state (CoglPipeline *authority,
   if (depth_state->depth_writing_enabled)
     {
       guint8 enabled = depth_state->depth_writing_enabled;
-      float near = depth_state->depth_range_near;
-      float far = depth_state->depth_range_far;
+      float near_val = depth_state->depth_range_near;
+      float far_val = depth_state->depth_range_far;
       hash = _cogl_util_one_at_a_time_hash (hash, &enabled, sizeof (enabled));
-      hash = _cogl_util_one_at_a_time_hash (hash, &near, sizeof (near));
-      hash = _cogl_util_one_at_a_time_hash (hash, &far, sizeof (far));
+      hash = _cogl_util_one_at_a_time_hash (hash, &near_val, sizeof (near_val));
+      hash = _cogl_util_one_at_a_time_hash (hash, &far_val, sizeof (far_val));
     }
 
   state->hash = hash;