xserver/render renderedge.c,1.2,1.3

[Carl Worth]

Committed by: cworth

Update of /cvs/xserver/xserver/render
In directory gabe:/tmp/cvs-serv12501/render

Modified Files:
	renderedge.c 
Log Message:

        * render/renderedge.c (RenderSampleFloorY): Import fix from xc:
        date: 2004/08/18 18:41:41;  author: kem;  state: Exp;  lines: +2 -2 branches:  \1.2.6;
        * programs/Xserver/render/renderedge.c: (RenderSampleFloorY):
        Fix AIX build problems (Bugs #1020, 1102, 1103, Dan McNichol).


Index: renderedge.c
===================================================================
RCS file: /cvs/xserver/xserver/render/renderedge.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- renderedge.c	18 Jan 2005 22:15:41 -0000	1.2
+++ renderedge.c	21 Jan 2005 16:24:55 -0000	1.3
@@ -44,7 +44,7 @@
     return (i | f);
 }
 
-#define div(a,b)    ((a) >= 0 ? (a) / (b) : -((-(a) + (b) - 1) / (b)))
+#define _div(a,b)    ((a) >= 0 ? (a) / (b) : -((-(a) + (b) - 1) / (b)))
 
 /*
  * Compute the largest value no greater than y which is on a
@@ -56,7 +56,7 @@
     xFixed   f = xFixedFrac(y);
     xFixed   i = xFixedFloor (y);
     
-    f = div(f - Y_FRAC_FIRST(n), STEP_Y_SMALL(n)) * STEP_Y_SMALL(n) + Y_FRAC_FIRST(n);
+    f = _div(f - Y_FRAC_FIRST(n), STEP_Y_SMALL(n)) * STEP_Y_SMALL(n) + Y_FRAC_FIRST(n);
     if (f < Y_FRAC_FIRST(n))
     {
 	f = Y_FRAC_LAST(n);