Use min/max instead of MIN/MAX.
diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c index 6a4e3f8..7cca796 100644 --- a/objects/enhmetafile.c +++ b/objects/enhmetafile.c
@@ -177,9 +177,9 @@ if (!buf) return sizeof(ENHMETAHEADER); emh = EMF_GetEnhMetaHeader(hmf); if(!emh) return FALSE; - memmove(buf, emh, MIN(sizeof(ENHMETAHEADER), bufsize)); + memmove(buf, emh, min(sizeof(ENHMETAHEADER), bufsize)); EMF_ReleaseEnhMetaHeader(hmf); - return MIN(sizeof(ENHMETAHEADER), bufsize); + return min(sizeof(ENHMETAHEADER), bufsize); } @@ -213,7 +213,7 @@ size - first - 1); EMF_ReleaseEnhMetaHeader(hmf); - return MIN(size, emh->nDescription); + return min(size, emh->nDescription); } /***************************************************************************** @@ -244,9 +244,9 @@ } memmove(buf, (char *) emh + emh->offDescription, - MIN(size,emh->nDescription)); + min(size,emh->nDescription)); EMF_ReleaseEnhMetaHeader(hmf); - return MIN(size, emh->nDescription); + return min(size, emh->nDescription); } /**************************************************************************** @@ -303,7 +303,7 @@ } /* Copy the lesser of the two byte counts */ - uEnhMetaFileSize = MIN( uEnhMetaFileSize, bufsize ); + uEnhMetaFileSize = min( uEnhMetaFileSize, bufsize ); /* Copy everything */ lpEnhMetaFile = EMF_GetEnhMetaHeader( hmf ); @@ -1375,7 +1375,7 @@ { PEMREOF lpEof = (PEMREOF)lpEMR; EMF_PaletteCopy* info = (EMF_PaletteCopy*)lpData; - DWORD dwNumPalToCopy = MIN( lpEof->nPalEntries, info->cEntries ); + DWORD dwNumPalToCopy = min( lpEof->nPalEntries, info->cEntries ); TRACE( "copying 0x%08lx palettes\n", dwNumPalToCopy );
diff --git a/objects/region.c b/objects/region.c index 7748d3d..bc1f95f 100644 --- a/objects/region.c +++ b/objects/region.c
@@ -1543,7 +1543,7 @@ * have to worry about using too much memory. I hope to be able to * nuke the Xrealloc() at the end of this function eventually. */ - newReg->size = MAX(reg1->numRects,reg2->numRects) * 2; + newReg->size = max(reg1->numRects,reg2->numRects) * 2; if (! (newReg->rects = HeapAlloc( GetProcessHeap(), 0, sizeof(RECT) * newReg->size ))) @@ -1614,8 +1614,8 @@ */ if (r1->top < r2->top) { - top = MAX(r1->top,ybot); - bot = MIN(r1->bottom,r2->top); + top = max(r1->top,ybot); + bot = min(r1->bottom,r2->top); if ((top != bot) && (nonOverlap1Func != (void (*)())NULL)) { @@ -1626,8 +1626,8 @@ } else if (r2->top < r1->top) { - top = MAX(r2->top,ybot); - bot = MIN(r2->bottom,r1->top); + top = max(r2->top,ybot); + bot = min(r2->bottom,r1->top); if ((top != bot) && (nonOverlap2Func != (void (*)())NULL)) { @@ -1656,7 +1656,7 @@ * Now see if we've hit an intersecting band. The two bands only * intersect if ybot > ytop */ - ybot = MIN(r1->bottom, r2->bottom); + ybot = min(r1->bottom, r2->bottom); curBand = newReg->numRects; if (ybot > ytop) { @@ -1699,7 +1699,7 @@ r1BandEnd++; } (* nonOverlap1Func) (newReg, r1, r1BandEnd, - MAX(r1->top,ybot), r1->bottom); + max(r1->top,ybot), r1->bottom); r1 = r1BandEnd; } while (r1 != r1End); } @@ -1714,7 +1714,7 @@ r2BandEnd++; } (* nonOverlap2Func) (newReg, r2, r2BandEnd, - MAX(r2->top,ybot), r2->bottom); + max(r2->top,ybot), r2->bottom); r2 = r2BandEnd; } while (r2 != r2End); } @@ -1786,8 +1786,8 @@ while ((r1 != r1End) && (r2 != r2End)) { - left = MAX(r1->left, r2->left); - right = MIN(r1->right, r2->right); + left = max(r1->left, r2->left); + right = min(r1->right, r2->right); /* * If there's any overlap between the two rectangles, add that @@ -2026,10 +2026,10 @@ REGION_RegionOp (newReg, reg1, reg2, (voidProcp) REGION_UnionO, (voidProcp) REGION_UnionNonO, (voidProcp) REGION_UnionNonO); - newReg->extents.left = MIN(reg1->extents.left, reg2->extents.left); - newReg->extents.top = MIN(reg1->extents.top, reg2->extents.top); - newReg->extents.right = MAX(reg1->extents.right, reg2->extents.right); - newReg->extents.bottom = MAX(reg1->extents.bottom, reg2->extents.bottom); + newReg->extents.left = min(reg1->extents.left, reg2->extents.left); + newReg->extents.top = min(reg1->extents.top, reg2->extents.top); + newReg->extents.right = max(reg1->extents.right, reg2->extents.right); + newReg->extents.bottom = max(reg1->extents.bottom, reg2->extents.bottom); newReg->type = (newReg->numRects) ? ((newReg->numRects > 1) ? COMPLEXREGION : SIMPLEREGION) : NULLREGION ; @@ -2711,8 +2711,8 @@ (Pts[2].x == Pts[3].x) && (Pts[3].y == Pts[0].y)))) { - SetRectRgn( hrgn, MIN(Pts[0].x, Pts[2].x), MIN(Pts[0].y, Pts[2].y), - MAX(Pts[0].x, Pts[2].x), MAX(Pts[0].y, Pts[2].y) ); + SetRectRgn( hrgn, min(Pts[0].x, Pts[2].x), min(Pts[0].y, Pts[2].y), + max(Pts[0].x, Pts[2].x), max(Pts[0].y, Pts[2].y) ); GDI_HEAP_UNLOCK( hrgn ); return hrgn; }