commit 6d77d3a1df2f707ed7543febf9364152cfcde9c7
author Francois Gouget <fgouget@psn.net> Sat Mar 25 21:44:35 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Mar 25 21:44:35 2000 +0000
tree 17dbd46ac127d5268fecf2f15fa3eecaac0c9af9
parent 77c30552aae7d4afa9b8a69b839b13efaabbf7e6

Use min/max instead of MIN/MAX.

windows/winpos.c

diff --git a/windows/winpos.c b/windows/winpos.c
index ba42028..f615246 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -1142,9 +1142,9 @@
                       MinMax.ptMaxPosition.x, MinMax.ptMaxPosition.y,
                       MinMax.ptMaxTrackSize.x, MinMax.ptMaxTrackSize.y,
                       MinMax.ptMinTrackSize.x, MinMax.ptMinTrackSize.y);
-    MinMax.ptMaxTrackSize.x = MAX( MinMax.ptMaxTrackSize.x,
+    MinMax.ptMaxTrackSize.x = max( MinMax.ptMaxTrackSize.x,
                                    MinMax.ptMinTrackSize.x );
-    MinMax.ptMaxTrackSize.y = MAX( MinMax.ptMaxTrackSize.y,
+    MinMax.ptMaxTrackSize.y = max( MinMax.ptMaxTrackSize.y,
                                    MinMax.ptMinTrackSize.y );
 
     if (maxSize) *maxSize = MinMax.ptMaxSize;
@@ -2087,8 +2087,8 @@
 	((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) == 0))
     {
 	WINPOS_GetMinMaxInfo( wndPtr, &maxSize, NULL, NULL, NULL );
-	winpos->cx = MIN( winpos->cx, maxSize.x );
-	winpos->cy = MIN( winpos->cy, maxSize.y );
+	winpos->cx = min( winpos->cx, maxSize.x );
+	winpos->cy = min( winpos->cy, maxSize.y );
     }
     return 0;
 }
@@ -2239,8 +2239,8 @@
 
 	r.left = Wnd->rectClient.left - Wnd->rectWindow.left;
         r.top = Wnd->rectClient.top  - Wnd->rectWindow.top;
-	r.right = r.left + MIN( ocw, ncw );
-	r.bottom = r.top + MIN( och, nch );
+	r.right = r.left + min( ocw, ncw );
+	r.bottom = r.top + min( och, nch );
 
 	REGION_CropRgn( hrgnValid, hrgnValid, &r, 
 			(uFlags & SWP_EX_PAINTSELF) ? NULL : (POINT*)&(Wnd->rectWindow));