Mercurial > MadButterfly

diff src/redraw_man.c @ 375:44b8223f307c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename MIN/MAX to MB_MIN/MB_MAX. - MIN and MAX are conflicted with system's macros.
author Thinker K.F. Li <thinker@branda.to>
date Wed, 01 Apr 2009 02:16:10 +0800
parents 3e84458968ec
children 7f7855df2af0
line wrap: on
line diff
--- a/src/redraw_man.c	Wed Apr 01 02:00:49 2009 +0800
+++ b/src/redraw_man.c	Wed Apr 01 02:16:10 2009 +0800
@@ -1614,28 +1614,28 @@
 	/* Even areas */
 	area = areas[i++];
 	if(area->w != 0 || area->h != 0) {
-	    poses0[0][0] = MIN(poses0[0][0], area->x);
-	    poses0[0][1] = MIN(poses0[0][1], area->y);
-	    poses0[1][0] = MAX(poses0[1][0], area->x + area->w);
-	    poses0[1][1] = MAX(poses0[1][1], area->y + area->h);
+	    poses0[0][0] = MB_MIN(poses0[0][0], area->x);
+	    poses0[0][1] = MB_MIN(poses0[0][1], area->y);
+	    poses0[1][0] = MB_MAX(poses0[1][0], area->x + area->w);
+	    poses0[1][1] = MB_MAX(poses0[1][1], area->y + area->h);
 	}
 	/* Odd areas */
 	area = areas[i++];
 	if(area->w != 0 || area->h != 0) {
-	    poses1[0][0] = MIN(poses1[0][0], area->x);
-	    poses1[0][1] = MIN(poses1[0][1], area->y);
-	    poses1[1][0] = MAX(poses1[1][0], area->x + area->w);
-	    poses1[1][1] = MAX(poses1[1][1], area->y + area->h);
+	    poses1[0][0] = MB_MIN(poses1[0][0], area->x);
+	    poses1[0][1] = MB_MIN(poses1[0][1], area->y);
+	    poses1[1][0] = MB_MAX(poses1[1][0], area->x + area->w);
+	    poses1[1][1] = MB_MAX(poses1[1][1], area->y + area->h);
 	}
     }
 
     if(i < n_areas) {
 	area = areas[i];
 	if(area->w != 0 || area->h != 0) {
-	    poses0[0][0] = MIN(poses0[0][0], area->x);
-	    poses0[0][1] = MIN(poses0[0][1], area->y);
-	    poses0[1][0] = MAX(poses0[1][0], area->x + area->w);
-	    poses0[1][1] = MAX(poses0[1][1], area->y + area->h);
+	    poses0[0][0] = MB_MIN(poses0[0][0], area->x);
+	    poses0[0][1] = MB_MIN(poses0[0][1], area->y);
+	    poses0[1][0] = MB_MAX(poses0[1][0], area->x + area->w);
+	    poses0[1][1] = MB_MAX(poses0[1][1], area->y + area->h);
 	}
     }