jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=44cc2b0a7d6ebcfee7d3ded63255294a205c5ca4

commit 44cc2b0a7d6ebcfee7d3ded63255294a205c5ca4
Author: Vincent Torri <vincent dot torri at gmail dot com>
Date:   Tue Dec 15 14:48:18 2015 +0900

    Examples Evas: 'far' and 'near' are Windows keywords, so rename them to 
far_ and near_
    
    Reviewers: cedric, jpeg
    
    Reviewed By: jpeg
    
    Subscribers: jpeg
    
    Differential Revision: https://phab.enlightenment.org/D3440
---
 src/examples/evas/evas-gl.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/examples/evas/evas-gl.c b/src/examples/evas/evas-gl.c
index 82965fc..62c213e 100644
--- a/src/examples/evas/evas-gl.c
+++ b/src/examples/evas/evas-gl.c
@@ -196,10 +196,10 @@ rotate_xyz(float matrix[16], const float anglex, const 
float angley,
 
 static int
 view_set_ortho(float result[16], const float left, const float right,
-               const float bottom, const float top, const float near,
-               const float far)
+               const float bottom, const float top, const float near_,
+               const float far_)
 {
-   if ((right - left) == 0.0f || (top - bottom) == 0.0f || (far - near) == 
0.0f)
+   if ((right - left) == 0.0f || (top - bottom) == 0.0f || (far_ - near_) == 
0.0f)
         return 0;
 
     result[0] = 2.0f / (right - left);
@@ -212,11 +212,11 @@ view_set_ortho(float result[16], const float left, const 
float right,
     result[7] = 0.0f;
     result[8] = 0.0f;
     result[9] = 0.0f;
-    result[10] = -2.0f / (far - near);
+    result[10] = -2.0f / (far_ - near_);
     result[11] = 0.0f;
     result[12] = -(right + left) / (right - left);
     result[13] = -(top + bottom) / (top - bottom);
-    result[14] = -(far + near) / (far - near);
+    result[14] = -(far_ + near_) / (far_ - near_);
     result[15] = 1.0f;
 
     return 1;

-- 


Reply via email to