comparison src/redraw_man.c @ 375:44b8223f307c

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
comparison
equal deleted inserted replaced
374:e1ff44aa3b6f 375:44b8223f307c
1612 1612
1613 for(; i < n_areas - 1;) { 1613 for(; i < n_areas - 1;) {
1614 /* Even areas */ 1614 /* Even areas */
1615 area = areas[i++]; 1615 area = areas[i++];
1616 if(area->w != 0 || area->h != 0) { 1616 if(area->w != 0 || area->h != 0) {
1617 poses0[0][0] = MIN(poses0[0][0], area->x); 1617 poses0[0][0] = MB_MIN(poses0[0][0], area->x);
1618 poses0[0][1] = MIN(poses0[0][1], area->y); 1618 poses0[0][1] = MB_MIN(poses0[0][1], area->y);
1619 poses0[1][0] = MAX(poses0[1][0], area->x + area->w); 1619 poses0[1][0] = MB_MAX(poses0[1][0], area->x + area->w);
1620 poses0[1][1] = MAX(poses0[1][1], area->y + area->h); 1620 poses0[1][1] = MB_MAX(poses0[1][1], area->y + area->h);
1621 } 1621 }
1622 /* Odd areas */ 1622 /* Odd areas */
1623 area = areas[i++]; 1623 area = areas[i++];
1624 if(area->w != 0 || area->h != 0) { 1624 if(area->w != 0 || area->h != 0) {
1625 poses1[0][0] = MIN(poses1[0][0], area->x); 1625 poses1[0][0] = MB_MIN(poses1[0][0], area->x);
1626 poses1[0][1] = MIN(poses1[0][1], area->y); 1626 poses1[0][1] = MB_MIN(poses1[0][1], area->y);
1627 poses1[1][0] = MAX(poses1[1][0], area->x + area->w); 1627 poses1[1][0] = MB_MAX(poses1[1][0], area->x + area->w);
1628 poses1[1][1] = MAX(poses1[1][1], area->y + area->h); 1628 poses1[1][1] = MB_MAX(poses1[1][1], area->y + area->h);
1629 } 1629 }
1630 } 1630 }
1631 1631
1632 if(i < n_areas) { 1632 if(i < n_areas) {
1633 area = areas[i]; 1633 area = areas[i];
1634 if(area->w != 0 || area->h != 0) { 1634 if(area->w != 0 || area->h != 0) {
1635 poses0[0][0] = MIN(poses0[0][0], area->x); 1635 poses0[0][0] = MB_MIN(poses0[0][0], area->x);
1636 poses0[0][1] = MIN(poses0[0][1], area->y); 1636 poses0[0][1] = MB_MIN(poses0[0][1], area->y);
1637 poses0[1][0] = MAX(poses0[1][0], area->x + area->w); 1637 poses0[1][0] = MB_MAX(poses0[1][0], area->x + area->w);
1638 poses0[1][1] = MAX(poses0[1][1], area->y + area->h); 1638 poses0[1][1] = MB_MAX(poses0[1][1], area->y + area->h);
1639 } 1639 }
1640 } 1640 }
1641 1641
1642 parent = coord->parent; 1642 parent = coord->parent;
1643 pcached_coord = parent->canvas_info->owner; 1643 pcached_coord = parent->canvas_info->owner;